需要售后订单处理逻辑优化调整及bug修复
This commit is contained in:
1 parent
854e10ed1a
commit
237fad81eb
9 files changed
+299
-189
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user