修复部分拍单问题 优化拍单显示
This commit is contained in:
1 parent
87c1b8fc79
commit
5571d227c8
13 files changed
+273
-108
No files matched your search
@@ -183,6 +183,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (lstPddBuyerAfterSaleInfoLite == null)
|
||||
lstPddBuyerAfterSaleInfoLite = new ObservableCollection<PddBuyerAfterSaleLiteInfo>();
|
||||
|
||||
lstPddBuyerAfterSaleInfoLite = new ObservableCollection<PddBuyerAfterSaleLiteInfo>(lstPddBuyerAfterSaleInfoLite.Where(af => af != null));
|
||||
foreach (var item in lstPddBuyerAfterSaleInfoLite.ToList())
|
||||
{
|
||||
if (item.orderDate < DateTime.Now.AddMonths(-1).ToString("yyMMdd").ParseToInt())
|
||||
@@ -747,7 +748,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order.ShopOrderIdStr = o.ShopOrderIdStr;
|
||||
order.ShopOrderSkuIdStr = o.ShopOrderSkuIdStr;
|
||||
order.ShopOrderSkuNameStr = o.ShopOrderSkuNameStr;
|
||||
order.TransitBuyerOrderRefundStatus = o.ShopOrderSkuNameStr;
|
||||
order.TransitBuyerOrderRefundStatus = o.TransitBuyerOrderRefundStatus;
|
||||
order.TransitWarehouseIdStr = o.TransitWarehouseIdStr;
|
||||
order.Express1WaybillStr = o.Express1WaybillStr;
|
||||
order.Express1CompanyStr = o.Express1CompanyStr;
|
||||
@@ -793,6 +794,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
//SendOrderE57(order);
|
||||
//if (order.sendStatus.ParseToString().Contains("售后"))
|
||||
|
||||
if (order.order_sn == "260706-681553467002665")
|
||||
{
|
||||
|
||||
}
|
||||
if (order.ShopOrderRefundStr.ParseToString().Contains("售后"))
|
||||
{
|
||||
if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
@@ -800,6 +806,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 待发货直接售后,并通知中转仓接口修改退货状态
|
||||
var afterSaleRst = PddAutoAfterSale(order);
|
||||
}
|
||||
// 作废订单 后台服务端自动进行 需要核对,未取号订单也无法取消
|
||||
//if (order.PreAllocatedOrderNoStr == "0" && order.WxOrderVoidStatus != "1")
|
||||
//{
|
||||
// string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
|
||||
// var data2 = new JObject();
|
||||
// data2["orderNo"] = order.ShopOrderIdStr;
|
||||
// data2["outOrderNo"] = order.order_sn;
|
||||
// var dataStr2 = JsonHelper.SerializeObject(data2);
|
||||
// var discardRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
|
||||
//}
|
||||
}
|
||||
|
||||
// 根据订单状态 取号/修改取号
|
||||
@@ -920,7 +936,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
bool isUpdate = false;
|
||||
PddBuyerAfterSaleLiteInfo afterSale = null;
|
||||
if (!this.lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId))
|
||||
if (!this.lstPddBuyerAfterSaleInfoLite.ToList().Any(or => or.afterSalesId == af.afterSalesId))
|
||||
{
|
||||
isUpdate = true;
|
||||
afterSale = af;
|
||||
@@ -1013,6 +1029,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
}
|
||||
}
|
||||
// 作废订单 后台服务端自动进行 需要核对,未取号订单也无法取消
|
||||
//if (afterSale.PreAllocatedOrderNoStr == "0" && afterSale.WxOrderVoidStatus != "1")
|
||||
//{
|
||||
// string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
|
||||
// var data2 = new JObject();
|
||||
// data2["orderNo"] = afterSale.ShopOrderIdStr;
|
||||
// data2["outOrderNo"] = afterSale.orderSn;
|
||||
// var dataStr2 = JsonHelper.SerializeObject(data2);
|
||||
// var discardRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
|
||||
//}
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_after_sale_list", lstPddBuyerAfterSaleInfoLite);
|
||||
}
|
||||
@@ -1649,6 +1675,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
////https://mobile.yangkeduo.com/order.html?order_sn=260417-318525949581688
|
||||
//// 退货详情页
|
||||
////https://mobile.yangkeduo.com/complaint.html?order_sn=260417-357103060621688&after_sales_reason=0&after_sales_type=1&after_sales_code=1001
|
||||
|
||||
if (order.ShopOrderIdStr == "3737553300321619456")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
if (!order.order_status_prompt.Contains("待发货"))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user