分销退货优化 提交退货包裹逻辑优化
This commit is contained in:
1 parent
a7076e7f3f
commit
4161c94243
11 files changed
+1851
-1323
No files matched your search
@@ -1325,10 +1325,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
else if (chkEmergencyShopCustomRefundNoWaybill.IsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty()))
|
||||
return true;
|
||||
|
||||
if (order.order_id == "3737838342857424896")
|
||||
{
|
||||
|
||||
}
|
||||
// 退货仓
|
||||
if (chkReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress))
|
||||
return true;
|
||||
// 非退货仓
|
||||
else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
||||
return true;
|
||||
|
||||
// 退款完成
|
||||
if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成")
|
||||
@@ -1337,12 +1339,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
else if (chkEmergencyShopInAfterSale.IsChecked == true && (order.DeliveryDeadlineDtatusStr != "退款中"))
|
||||
return true;
|
||||
|
||||
//// 退货退款
|
||||
//if (chkEmergencyReturn.IsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.RefundStatusStr).ParseToString().Contains("退货"))
|
||||
// return true;
|
||||
//// 仅退款
|
||||
//else if (chkEmergencyRefund.IsChecked == true && (order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.RefundStatusStr).ParseToString().Contains("退货"))
|
||||
// return true;
|
||||
// 退货退款
|
||||
if (chkEmergencyReturn.IsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN"))
|
||||
return true;
|
||||
@@ -1769,11 +1765,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
foreach (var orderItem in tmpOrderItems)
|
||||
{
|
||||
if (orderItem.order_id == "3738480261631214336")
|
||||
if (orderItem.order_id == "3738517858745481728")
|
||||
{
|
||||
|
||||
}
|
||||
await Task.Run(() => { TransitReturnOrderWindow.AddReturnOrder(orderItem); });
|
||||
// 10元余额才允许自动创建退货仓分销退货
|
||||
if (BaseClass.Balance > 10)
|
||||
{
|
||||
await Task.Run(() => { TransitReturnOrderWindow.AddReturnOrder(orderItem); });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1802,6 +1802,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 退货地址不是退货仓,跳过
|
||||
if (orderItem.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress)
|
||||
continue;
|
||||
// 退货包裹未发货,跳过(仅退货退款已发货的才自动去申请拼多多退货退款)
|
||||
if ((orderItem.ItemRefund?.return_waybill_id).IsNullOrEmpty())
|
||||
continue;
|
||||
|
||||
// 退货地址是退货仓的,直接申请退货退款,取到地址后直接去填写退货仓退货信息
|
||||
if (orderItem?.ItemOrder?.OrderBuyType == "云仓")
|
||||
@@ -2149,6 +2152,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private void chkEmergencyReturnOrder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (sender is CheckBox chk)
|
||||
{
|
||||
var isCheck = !chk.IsChecked.ParseToBool();
|
||||
chkReturnOrderAddress.IsChecked = chkNotReturnOrderAddress.IsChecked = false;
|
||||
chk.IsChecked = !isCheck;
|
||||
}
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
private DialogWindow _statisticsWindow;
|
||||
private void btn_ShowShopRevenueStatisticsView(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user