diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
index e21bb4d..ed7f4d3 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
@@ -2518,10 +2518,18 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
public static string GetAfterSaleAddress(BuyerLoginInfo buyer, string orderSn, string afterSalesId)
{
- //https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=21892258236871&order_sn=260721-113109931520980&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
- //&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
- string url = "https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=" + afterSalesId + "&order_sn=" + orderSn;
- var rst = HttpResponseYkdBLL.YangkeduoGetPageResponse(buyer, url);
+ //https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=21892258236871&order_sn=260721-113109931520980&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
+ //&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
+ string refPageId = "10038_" + BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10);
+ string url = "https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=" + afterSalesId + "&order_sn=" + orderSn + "&refer_page_name=order_detail&refer_page_id=" + refPageId + "&refer_page_sn=10038";
+ string refere = "https://mobile.yangkeduo.com/order.html?order_sn=" + orderSn + "&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order" +
+ "&refer_page_id=10032_" + BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10) + "&refer_page_sn=10032&page_id=" + refPageId + "&is_back=1";
+ //url = "https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=22261687961679&order_sn=260819-017951649351926&refer_page_name=order_detail&refer_page_id=10038_1787734305016_cb6b9im8jg&refer_page_sn=10038";
+ //refere = "https://mobile.yangkeduo.com/order.html?order_sn=260819-017951649351926&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order&refer_page_id=10032_1787734304425_5EGkUPjpA9&refer_page_sn=10032&page_id=10038_1787734305016_cb6b9im8jg&is_back=1";
+
+
+
+ var rst = HttpResponseYkdBLL.YangkeduoGetPageResponse(buyer, url, refere);
return rst;
}
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index d78c215..5af86d4 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -752,168 +752,223 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -942,6 +997,17 @@
+
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 85b7df8..a8adc63 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -418,7 +418,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
});
// 处理中转仓退货包裹
- BottomMsg = "当前正在处理中转仓退回...";
+ BottomMsg = "当前正在处理拦截退回总店...";
if (string.IsNullOrEmpty(orderIds))
AutoUpdateTransitPackageToPddShop();
@@ -893,7 +893,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// };
//}
- if (orderItem.order_id == "3738442174434006784")
+ if (orderItem.order_id == "3738534855500515072")
{
}
@@ -969,8 +969,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
foreach (var orderItem in order.orderItems)
{
- if (orderItem.order_id == "3738598656037525761")
- {
+ if (orderItem.order_id == "3738534855500515072")
+ {
}
if (order.OrderBuyType == "直发" || order.OrderBuyType == "云改直")
@@ -1482,6 +1482,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (!order.IsEmergencyManualReturnOrder)
return true;
+ //"System.Windows.Controls.ComboBoxItem: 未申请";
+ var cmbRejectStatusText = cmbRejectStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
+ if (cmbRejectStatusText == "未申请" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "申请"))
+ return true;
+ if (cmbRejectStatusText == "申请中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "已申请拒收"))
+ return true;
+ if (cmbRejectStatusText == "拒收成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请拒收成功")))
+ return true;
+ if (cmbRejectStatusText == "拒收失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请拒收失败")))
+ return true;
+
+
if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
return true;
else if (chkEmergencyBuyerWaitSendBack.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
@@ -1503,11 +1515,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
// return true;
- // 退款完成
- if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成")
+ // 商家受理中
+ if (chkEmergencyWaitSupplierAccept.IsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "商家受理中"))
+ return true;
+ // 待商家收货
+ if (chkEmergencyWaitSupplierReceive.IsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "待商家收货"))
+ return true;
+ // 退款完成(但买手没退)
+ if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
return true;
// 退款中
- else if (chkEmergencyShopInAfterSale.IsChecked == true && (order.DeliveryDeadlineDtatusStr != "退款中"))
+ else if (chkEmergencyShopInAfterSale.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
return true;
// 退货退款
@@ -1755,7 +1773,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (sender is CheckBox chk)
{
var isCheck = !chk.IsChecked.ParseToBool();
- chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
+ chkEmergencyWaitSupplierReceive.IsChecked = chkEmergencyWaitSupplierAccept.IsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
chk.IsChecked = !isCheck;
}
FilterOrders();
@@ -1969,7 +1987,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
foreach (var orderItem in order.orderItems)
{
- if (order.order_id == "3738480261631214336")
+ if (order.order_id == "3738534855500515072")
{
}
@@ -2021,6 +2039,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
int index = 0;
foreach (var tmpOrderItem in tmpOrderItems)
{
+ if (tmpOrderItem.order_id == "3738534855500515072")
+ {
+
+ }
+
Dispatcher.Invoke(new Action(() => { BottomMsg = "正在处理买手退货，总计：" + tmpOrderItems.Count + "，已处理：" + index++; }));
var pddOrderSn = "";
@@ -2103,8 +2126,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
refundAmount = pddBuyerOrderLiteInfo.order_amount,
orderDate = pddOrderSn.ParseToString().Split('-').FirstOrDefault().ParseToInt(),
};
- if (orderItem.PddBuyerAfterSale != null)
+ // 根据云仓还是直发判断是哪个买手单
+ if (tmpOrderItem.ItemOrder?.OrderBuyType == "云仓" && orderItem.PddBuyerAfterSale != null)
pddBuyerAfterSale = orderItem.PddBuyerAfterSale;
+ if (tmpOrderItem.ItemOrder?.OrderBuyType != "云仓" && orderItem.DirectPddBuyerAfterSale != null)
+ pddBuyerAfterSale = orderItem.DirectPddBuyerAfterSale;
bool isSimPddAfterSaleSuccess = true;
if (refundStatusStr.Contains("需手动申请售后"))
@@ -2199,6 +2225,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
address = BaseRegex.GetStringJson(ref merchantReceiverInfo, "copyValue");
}
+ if (addressRst.Contains("网络异常，请稍后重试"))
+ {
+ BaseMsgWindow.ShowAnimateMessage("买手 " + buyer.buyer_nick + " 网络异常，请手动获取总店退货地址并填写", "Msg", 5);
+ }
var url3 = BaseClass.Build29WxObjString("order/wx_add_mdy_buyer_after_sale");
var data3 = UserLogin.GetSignaturex();
@@ -2489,6 +2519,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
}
+
+ private void cmbRejectStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ FilterOrders();
+ }
}
public class OrderFilterConfig : PropertyNotifyObject
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index b5107c2..536e37a 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -41,7 +41,7 @@
+ Text="{Binding DeliveryDeadlineStatusStr}" BorderThickness="0" />
@@ -55,7 +55,7 @@
+ Text="{Binding DeliveryDeadlineStatusStr}" BorderThickness="0" />
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index f7fcc1e..4445430 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -1556,7 +1556,7 @@
BorderBrush="Transparent"
BorderThickness="1"
IsReadOnly="True"
- Text="中转仓退回：" />
+ Text="拦截退回总店：" />
+ WaterMark="拦截退回总店" />