异常单补拍单功能
This commit is contained in:
1 parent
2e20cbdf68
commit
7264835cc6
13 files changed
+570
-362
No files matched your search
@@ -1,5 +1,6 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.CefHelper;
|
||||
using _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model;
|
||||
@@ -53,6 +54,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
public ObservableCollection<PddBuyerOrderLiteInfo> lstFilterPddBuyerOrderInfoLite { get; set; } = new ObservableCollection<PddBuyerOrderLiteInfo>();
|
||||
public ObservableCollection<PddBuyerAfterSaleLiteInfo> lstPddBuyerAfterSaleInfoLite { get; set; } = new ObservableCollection<PddBuyerAfterSaleLiteInfo>();
|
||||
public ObservableCollection<PddBuyerAfterSaleLiteInfo> lstFilterPddBuyerAfterSaleInfoLite { get; set; } = new ObservableCollection<PddBuyerAfterSaleLiteInfo>();
|
||||
public ConcurrentList<string> lstPddBuyerOrderVoidAfterSaleOrderSn { get; set; } = new ConcurrentList<string>();
|
||||
public CancellationTokenSource cancellationTokenSource { get; set; } = new CancellationTokenSource();
|
||||
//public ChromiumWebBrowser cefWebBrowser = null;
|
||||
public BuyerReadOrderConfig buyerReadOrderConfig = new BuyerReadOrderConfig();
|
||||
@@ -572,6 +574,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
pdd_order.TransitBuyerOrderRefundStatus = wx_transit_order?.refund_status;
|
||||
pdd_order.TransitWarehouseIdStr = wx_transit_order?.platform;
|
||||
pdd_order.TransitWarehouseOrderCodeStr = wx_transit_order?.order_code;
|
||||
pdd_order.Express1WaybillStr = wx_transit_order?.express_1_waybill;
|
||||
pdd_order.Express1CompanyStr = wx_transit_order?.express_1_company;
|
||||
pdd_order.Express2WaybillStr = wx_transit_order?.express_2_waybill;
|
||||
@@ -596,15 +599,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
pdd_afterSale.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
|
||||
pdd_afterSale.ShopOrderSkuNameStr = wx_order_item?.sku_attr_str;
|
||||
pdd_afterSale.WxOrderCreateTime = wx_order_item?.ItemOrder?.create_time == null ? DateTime.MinValue : BaseClass.StampToDateTime((wx_order_item?.ItemOrder?.create_time).ParseToInt());
|
||||
pdd_afterSale.ShopOrderRefundStr = ""; // (/*refund_item?.count > 0 &&*/ wx_order_item.refund_status > 1) ? "店铺售后" : "";
|
||||
pdd_afterSale.ShopOrderRefundStr = ""; // (/*refund_item?.count > 0 &&*/ wx_order_item?.refund_status > 1) ? "店铺售后" : "";
|
||||
//pdd_afterSale.wxRefundStatus = "";
|
||||
if (wx_order_item.refund_status > 1)
|
||||
if (wx_order_item?.refund_status > 1)
|
||||
{
|
||||
pdd_afterSale.ShopOrderRefundStr = "店铺售后";
|
||||
//pdd_afterSale.wxRefundStatus = pdd_afterSale.order_status_prompt.Contains("待发货") ? "待退款" : "待退货";
|
||||
}
|
||||
pdd_afterSale.TransitBuyerOrderRefundStatus = wx_transit_order?.refund_status;
|
||||
pdd_afterSale.TransitWarehouseIdStr = wx_transit_order?.platform;
|
||||
pdd_afterSale.TransitWarehouseOrderCodeStr = wx_transit_order?.order_code;
|
||||
pdd_afterSale.Express1WaybillStr = wx_transit_order?.express_1_waybill;
|
||||
pdd_afterSale.Express1CompanyStr = wx_transit_order?.express_1_company;
|
||||
pdd_afterSale.Express2WaybillStr = wx_transit_order?.express_2_waybill;
|
||||
@@ -750,6 +754,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order.ShopOrderSkuNameStr = o.ShopOrderSkuNameStr;
|
||||
order.TransitBuyerOrderRefundStatus = o.TransitBuyerOrderRefundStatus;
|
||||
order.TransitWarehouseIdStr = o.TransitWarehouseIdStr;
|
||||
order.TransitWarehouseOrderCodeStr = o.TransitWarehouseOrderCodeStr;
|
||||
order.Express1WaybillStr = o.Express1WaybillStr;
|
||||
order.Express1CompanyStr = o.Express1CompanyStr;
|
||||
order.Express2WaybillStr = o.Express2WaybillStr;
|
||||
@@ -799,6 +804,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
|
||||
}
|
||||
// 微信售后,服务端自动作废订单,客户端取消买手订单即可
|
||||
if (order.ShopOrderRefundStr.ParseToString().Contains("售后"))
|
||||
{
|
||||
if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
|
||||
@@ -806,16 +812,6 @@ 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, "");
|
||||
//}
|
||||
}
|
||||
|
||||
// 根据订单状态 取号/修改取号
|
||||
@@ -914,10 +910,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
}
|
||||
var refunds = GetOrderRefundInfo(order_ids);
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(order_ids);
|
||||
|
||||
foreach (var af in list)
|
||||
{
|
||||
if (af.orderSn == "260414-035525772830257")
|
||||
if (af.orderSn == "260718-221343925901688")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -926,14 +923,20 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
af.buyerName = buyer.buyer_name;
|
||||
|
||||
// 查找店铺订单并更新店铺订单状态
|
||||
var transit_item = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == af.orderSn);
|
||||
if (transit_item != null)
|
||||
var transitItem = transitOrderList.FirstOrDefault(t1 => t1.out_order_no == af.orderSn);
|
||||
oms_wei_order_info shopOrder = null;
|
||||
oms_wei_order_item_info orderItem = null;
|
||||
oms_wei_refund_info refundItem = null;
|
||||
if (transitItem != null)
|
||||
{
|
||||
var shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
|
||||
var order_item = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
|
||||
var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
|
||||
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no);
|
||||
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
|
||||
refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
|
||||
//shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o1 => o1.order_id == transitItem.order_no);
|
||||
//orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
|
||||
//refundItem = shopOrder?.refundItems.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
|
||||
|
||||
UpdateAfterSaleStatus(af, order_item, refund_item, transit_item);
|
||||
UpdateAfterSaleStatus(af, orderItem, refundItem, transitItem);
|
||||
}
|
||||
|
||||
bool isUpdate = false;
|
||||
@@ -973,6 +976,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
afterSale.ShopOrderSkuNameStr = af.ShopOrderSkuNameStr;
|
||||
afterSale.TransitBuyerOrderRefundStatus = af.TransitBuyerOrderRefundStatus;
|
||||
afterSale.TransitWarehouseIdStr = af.TransitWarehouseIdStr;
|
||||
afterSale.TransitWarehouseOrderCodeStr = af.TransitWarehouseOrderCodeStr;
|
||||
afterSale.Express1WaybillStr = af.Express1WaybillStr;
|
||||
afterSale.Express1CompanyStr = af.Express1CompanyStr;
|
||||
afterSale.Express2WaybillStr = af.Express2WaybillStr;
|
||||
@@ -1060,16 +1064,28 @@ 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, "");
|
||||
//}
|
||||
// 买手已退款
|
||||
if (afterSale.TransitBuyerOrderRefundStatus == "买手退款成功")
|
||||
{
|
||||
// 订单是未退款的仓库单(因一个微信订单,可以作废重拍多次,可能存在多个拼多多买手单,此处要使用买手单号对应的 transitItem 作为是否作废的判断依据
|
||||
if (orderItem != null && orderItem.refund_status <= 1 && transitItem != null && transitItem.order_void_status == 0)
|
||||
{
|
||||
// 如果当前账户店铺有订单未发货,尝试作废订单。
|
||||
if (shopOrder != null && shopOrder.status == 20 && GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == shopOrder.shop_id))
|
||||
{
|
||||
// 260718-221343925901688
|
||||
// 260718-626513702541688
|
||||
// 3737821766770121728
|
||||
// 3737821766770121728
|
||||
// 单次读取的订单放到一个列表,如果列表有就不再调用(每次订单列表模拟读取会有重复调用的可能)
|
||||
if (!lstPddBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
|
||||
{
|
||||
lstPddBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
|
||||
OrderListRowItemCtrl.VoidOrder(orderItem, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_after_sale_list", lstPddBuyerAfterSaleInfoLite);
|
||||
}
|
||||
@@ -1112,6 +1128,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
void GetPddOrder()
|
||||
{
|
||||
isReadBuyerOrder = true;
|
||||
lstPddBuyerOrderVoidAfterSaleOrderSn.Clear();
|
||||
|
||||
if (cancellationTokenSource != null)
|
||||
cancellationTokenSource.Cancel();
|
||||
@@ -1486,6 +1503,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
JObject data = new JObject();
|
||||
data["outOrderNo"] = order.order_sn;
|
||||
//data["outOrderNo"] = order.TransitWarehouseOrderCodeStr;
|
||||
data["warehouseCode"] = order.TransitWarehouseIdStr; //transit.TransId; // 中转仓仓库对应编码
|
||||
data["platform"] = "WEISHOP";
|
||||
var getVirtualTicketUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/order/virtual/create";
|
||||
@@ -1540,6 +1558,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
data["outAmount"] = order.order_amount.ParseToString();
|
||||
data["outAccount"] = order.buyerName;
|
||||
data["outOrderNo"] = order.order_sn;
|
||||
//data["outOrderNo"] = order.TransitWarehouseOrderCodeStr;
|
||||
data["outExpressCompany"] = order.outExpressCompanyCode; // 物流公司编号
|
||||
data["outExpressNo"] = order.tracking_number; // 物流编号
|
||||
data["warehouseCode"] = order.TransitWarehouseIdStr; // 中转仓ID
|
||||
@@ -1585,13 +1604,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
|
||||
var data = new JObject();
|
||||
//data["outAmount"] = order.order_amount.ParseToString();
|
||||
//data["outAccount"] = order.buyerName;
|
||||
data["outOrderNo"] = order.order_sn;
|
||||
data["outExpressCompany"] = order.outExpressCompanyCode; // 物流公司编号
|
||||
data["outExpressNo"] = order.tracking_number;
|
||||
data["platform"] = "WEISHOP";
|
||||
data["orderCode"] = order.order_sn; // 中转仓订单唯一标识码 = 外采订单号
|
||||
data["orderCode"] = order.TransitWarehouseOrderCodeStr; // 中转仓订单唯一标识码 = 外采订单号
|
||||
var dataStr2 = JsonHelper.SerializeObject(data);
|
||||
var dispatchRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
|
||||
|
||||
|
||||
Reference in new issue
Block a user