分销退货优化 提交退货包裹逻辑优化
This commit is contained in:
1 parent
a7076e7f3f
commit
4161c94243
11 files changed
+1851
-1323
No files matched your search
@@ -56,7 +56,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
this.cmbExpressName.Items.Add("极兔速递");
|
||||
this.cmbExpressName.Items.Add("申通快递");
|
||||
this.cmbExpressName.Items.Add("韵达快递");
|
||||
this.cmbExpressName.Items.Add("圆通快递");
|
||||
this.cmbExpressName.Items.Add("圆通速递");
|
||||
this.cmbExpressName.Items.Add("中通快递");
|
||||
this.cmbExpressName.Items.Add("百世快运");
|
||||
this.cmbExpressName.Items.Add("顺丰速运");
|
||||
@@ -178,7 +178,10 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
jObj["orderDetailsList"] = new JArray();
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
if (btnAdd.Content.ToString() == "添 加")
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
var addReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/addReturnOrder";
|
||||
var addReturnOrderStr = JsonHelper.SerializeObject(jObj);
|
||||
@@ -193,8 +196,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var orderCode = returnOrders.OrderBy(o => o.created_at).LastOrDefault()?.order_code;
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowError("中转仓退货订单创建失败,售后单获取失败");
|
||||
@@ -205,9 +209,10 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
var createObj = new JObject();
|
||||
createObj["orderCode"] = orderCode;
|
||||
createObj["logisticsCode"] = jObj["logisticsCode"].ParseToString();
|
||||
createObj["logisticsExpressCode"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
createObj["logisticsExpressNo"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
var createReturnOrderStr = JsonHelper.SerializeObject(createObj);
|
||||
var createReturnOrderRst = HttpResponseWXBLL.e57PostResponse(createReturnOrderUrl, createReturnOrderStr, "");
|
||||
//<AjaxResult><msg>创建第三方退货订单成功</msg><code>0</code></AjaxResult>
|
||||
if (!createReturnOrderRst.ParseToString().Contains("<code>200</code>") && !createReturnOrderRst.ParseToString().Contains("<code>0</code>"))
|
||||
{
|
||||
string msg = BaseRegex.GetStringXml(ref createReturnOrderRst, "msg");
|
||||
@@ -295,6 +300,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
var addReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/addReturnOrder";
|
||||
@@ -310,8 +317,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
}
|
||||
}
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var orderCode = returnOrders.OrderBy(o => o.created_at).LastOrDefault()?.order_code;
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败,售后单获取失败", "Error", 5);
|
||||
@@ -322,7 +330,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
var createObj = new JObject();
|
||||
createObj["orderCode"] = orderCode;
|
||||
createObj["logisticsCode"] = jObj["logisticsCode"].ParseToString();
|
||||
createObj["logisticsExpressCode"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
createObj["logisticsExpressNo"] = jObj["logisticsExpressNo"].ParseToString();
|
||||
var createReturnOrderStr = JsonHelper.SerializeObject(createObj);
|
||||
var createReturnOrderRst = HttpResponseWXBLL.e57PostResponse(createReturnOrderUrl, createReturnOrderStr, "");
|
||||
if (!createReturnOrderRst.ParseToString().Contains("<code>200</code>") && !createReturnOrderRst.ParseToString().Contains("<code>0</code>"))
|
||||
@@ -335,9 +343,9 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建成功", "Msg", 2);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user