增量读取订单功能 90% 新的二级oem 50%
This commit is contained in:
1 parent
e3f4e34def
commit
171064f03f
31 files changed
+1169
-624
No files matched your search
@@ -748,9 +748,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 处理这些获取到的微信订单
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -776,7 +776,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (wxOrder != null)
|
||||
{
|
||||
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 "";
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
@@ -797,7 +797,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transit_item != null)
|
||||
{
|
||||
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
|
||||
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
|
||||
UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
|
||||
}
|
||||
@@ -1087,9 +1087,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -1125,7 +1125,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
|
||||
if (wxOrder != null)
|
||||
{
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
@@ -1139,7 +1139,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transitItem != null)
|
||||
{
|
||||
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));
|
||||
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
|
||||
buyerAfterSale = buyerAfterSales.FirstOrDefault(ba => ba.orderSn == transitItem.out_order_no && !ba.afterSaleAddress.IsNullOrEmpty());
|
||||
//refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
|
||||
|
||||
@@ -2207,10 +2207,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
// 中转仓订单
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -2226,7 +2226,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transit_item != null)
|
||||
{
|
||||
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no);
|
||||
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
var order_item = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
|
||||
|
||||
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
|
||||
@@ -2361,10 +2361,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
order.sendStatus = "取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
@@ -2417,10 +2417,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
order.sendStatus = "修改提前取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
@@ -2727,7 +2727,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
||||
if (mainOrder != null)
|
||||
{
|
||||
var orderItem = mainOrder.orderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||
var orderItem = mainOrder.OrderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||
if (orderItem != null)
|
||||
orderItem.SyncLogisticsMsg = ex.Message;
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
{
|
||||
//OrderListCtrl.InitOrderObservableProp(order);
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
}
|
||||
@@ -220,7 +220,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
{
|
||||
//OrderListCtrl.InitOrderObservableProp(order);
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
}
|
||||
@@ -345,7 +345,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
{
|
||||
//OrderListCtrl.InitOrderObservableProp(order);
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
@@ -364,7 +364,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
{
|
||||
//OrderListCtrl.InitOrderObservableProp(order);
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
|
||||
@@ -675,9 +675,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 处理这些获取到的微信订单
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -708,7 +708,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (wxOrder != null)
|
||||
{
|
||||
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 "";
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
@@ -729,7 +729,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transit_item != null)
|
||||
{
|
||||
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
|
||||
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
|
||||
UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
|
||||
}
|
||||
@@ -1019,9 +1019,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -1057,7 +1057,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
|
||||
if (wxOrder != null)
|
||||
{
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
@@ -1071,7 +1071,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transitItem != null)
|
||||
{
|
||||
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));
|
||||
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
|
||||
buyerAfterSale = buyerAfterSales.FirstOrDefault(ba => ba.orderSn == transitItem.out_order_no && !ba.afterSaleAddress.IsNullOrEmpty());
|
||||
//refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
|
||||
|
||||
@@ -1773,10 +1773,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
// 中转仓订单
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -1792,7 +1792,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transit_item != null)
|
||||
{
|
||||
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no);
|
||||
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
var order_item = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
|
||||
|
||||
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
|
||||
@@ -1924,10 +1924,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
order.sendStatus = "取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
@@ -1980,10 +1980,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
order.sendStatus = "修改提前取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
@@ -2281,7 +2281,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
||||
if (mainOrder != null)
|
||||
{
|
||||
var orderItem = mainOrder.orderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||
var orderItem = mainOrder.OrderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||
if (orderItem != null)
|
||||
orderItem.SyncLogisticsMsg = ex.Message;
|
||||
}
|
||||
|
||||
@@ -346,7 +346,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
this.txtShopGoodsNameVal = orderItem.title;
|
||||
this.txtShopSpecNameVal = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString();
|
||||
|
||||
if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
|
||||
{
|
||||
@@ -926,7 +926,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
|
||||
{
|
||||
@@ -990,7 +990,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
|
||||
(item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
|
||||
@@ -1112,8 +1112,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
|
||||
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
body["parentOemId"] = BaseClass.ParentOemId;
|
||||
body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["oemId"] = BaseClass.OemId;
|
||||
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
}
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
this.txtShopGoodsNameVal = orderItem.title;
|
||||
this.txtShopSpecNameVal = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString();
|
||||
|
||||
if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
|
||||
{
|
||||
@@ -1641,7 +1641,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
|
||||
{
|
||||
@@ -1705,7 +1705,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
|
||||
(item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
|
||||
@@ -1827,8 +1827,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
|
||||
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
body["parentOemId"] = BaseClass.ParentOemId;
|
||||
body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["oemId"] = BaseClass.OemId;
|
||||
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
}
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
|
||||
@@ -715,9 +715,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 处理这些获取到的微信订单
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -748,7 +748,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (wxOrder != null)
|
||||
{
|
||||
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 "";
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
@@ -769,7 +769,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transit_item != null)
|
||||
{
|
||||
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
|
||||
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
|
||||
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
|
||||
UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
|
||||
}
|
||||
@@ -1060,9 +1060,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -1099,7 +1099,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
|
||||
if (wxOrder != null)
|
||||
{
|
||||
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
|
||||
if (wxOrderItem != null)
|
||||
{
|
||||
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
|
||||
@@ -1113,7 +1113,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transitItem != null)
|
||||
{
|
||||
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));
|
||||
orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
|
||||
buyerAfterSale = buyerAfterSales.FirstOrDefault(ba => ba.orderSn == transitItem.out_order_no && !ba.afterSaleAddress.IsNullOrEmpty());
|
||||
//refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
|
||||
|
||||
@@ -1630,10 +1630,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
|
||||
foreach (var order in orders)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
// 中转仓订单
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
|
||||
else
|
||||
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
|
||||
@@ -1649,7 +1649,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (transit_item != null)
|
||||
{
|
||||
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no);
|
||||
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
var order_item = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
|
||||
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
|
||||
|
||||
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
|
||||
@@ -1786,10 +1786,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
|
||||
order.sendStatus = "取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
@@ -1842,10 +1842,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
order.sendStatus = "修改提前取号成功";
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
|
||||
if (shopOrder != null)
|
||||
{
|
||||
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
|
||||
if (orderItem != null)
|
||||
{
|
||||
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
|
||||
@@ -2143,7 +2143,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
||||
if (mainOrder != null)
|
||||
{
|
||||
var orderItem = mainOrder.orderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||
var orderItem = mainOrder.OrderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||
if (orderItem != null)
|
||||
orderItem.SyncLogisticsMsg = ex.Message;
|
||||
}
|
||||
|
||||
@@ -6,10 +6,15 @@ using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Security.Policy;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Threading;
|
||||
using Work;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
@@ -29,23 +34,434 @@ public class OrderGetOrderListHelper
|
||||
var shopIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var shopIds = string.Join(",", shopIdList);
|
||||
|
||||
var existOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var updateOrderList = await GetOrderInfoBase(null, 0, shopIds, lastUpdateTime);
|
||||
var updateOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var orderIdList = existOrderIdList;
|
||||
orderIdList.AddRange(updateOrderIdList);
|
||||
orderIdList = orderIdList.Distinct().ToList();
|
||||
int pageCount = 1;
|
||||
List<oms_wei_order_info> upadtaOrderList = new List<oms_wei_order_info>();
|
||||
var beginDatetime = lastUpdateTime;
|
||||
var endDateTime = DateTime.Now;
|
||||
lastUpdateTime = endDateTime.AddSeconds(-30);
|
||||
for (int page = 1; page <= pageCount; page++)
|
||||
{
|
||||
var erpOrderInfo = await GetOrderInfoBase(null, shopIds, beginDatetime, endDateTime, page, 100, page == 1);
|
||||
|
||||
if (page == 1)
|
||||
pageCount = erpOrderInfo.PageCount;
|
||||
|
||||
// 遇到相同订单就更新状态,否则就新增一条数据
|
||||
foreach (var order in erpOrderInfo.OrderList)
|
||||
{
|
||||
var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
if (orderExist == null)
|
||||
{
|
||||
GlobalConfig.lstOrder.Add(order);
|
||||
}
|
||||
else
|
||||
{
|
||||
orderExist.shop_id = order.shop_id;
|
||||
orderExist.shop_name = order.shop_name;
|
||||
orderExist.merchant_id = order.merchant_id;
|
||||
orderExist.order_id = order.order_id;
|
||||
orderExist.openid = order.openid;
|
||||
orderExist.create_time = order.create_time;
|
||||
orderExist.update_time = order.update_time;
|
||||
orderExist.unionid = order.unionid;
|
||||
orderExist.status = order.status;
|
||||
orderExist.aftersale_detail = order.aftersale_detail;
|
||||
orderExist.pay_info = order.pay_info;
|
||||
orderExist.ext_info = order.ext_info;
|
||||
orderExist.product_price = order.product_price;
|
||||
orderExist.order_price = order.order_price;
|
||||
orderExist.purchase_price = order.purchase_price;
|
||||
orderExist.purchase_time = order.purchase_time;
|
||||
orderExist.freight = order.freight;
|
||||
orderExist.predict_commission_fee = order.predict_commission_fee;
|
||||
orderExist.commission_amount = order.commission_amount;
|
||||
orderExist.discounted_price = order.discounted_price;
|
||||
orderExist.profit = order.profit;
|
||||
orderExist.purchase_status = order.purchase_status;
|
||||
orderExist.delivery_deadline = order.delivery_deadline;
|
||||
orderExist.delivery_time = order.delivery_time;
|
||||
orderExist.user_name = order.user_name;
|
||||
orderExist.postal_code = order.postal_code;
|
||||
orderExist.province_name = order.province_name;
|
||||
orderExist.city_name = order.city_name;
|
||||
orderExist.county_name = order.county_name;
|
||||
orderExist.detail_info = order.detail_info;
|
||||
orderExist.tel_number = order.tel_number;
|
||||
orderExist.house_number = order.house_number;
|
||||
orderExist.virtual_order_tel_number = order.virtual_order_tel_number;
|
||||
orderExist.tel_number_ext_info = order.tel_number_ext_info;
|
||||
orderExist.use_tel_number = order.use_tel_number;
|
||||
orderExist.hash_code = order.hash_code;
|
||||
orderExist.delivery_product_info = order.delivery_product_info;
|
||||
orderExist.ship_done_time = order.ship_done_time;
|
||||
orderExist.ewaybill_order_code = order.ewaybill_order_code;
|
||||
orderExist.settle_info = order.settle_info;
|
||||
orderExist.audit_status = order.audit_status;
|
||||
orderExist.audit_time = order.audit_time;
|
||||
orderExist.erp_send_company = order.erp_send_company;
|
||||
orderExist.erp_send_code = order.erp_send_code;
|
||||
orderExist.erp_send_status = order.erp_send_status;
|
||||
orderExist.erp_send_time = order.erp_send_time;
|
||||
orderExist.colour_flag = order.colour_flag;
|
||||
orderExist.colour_flag_update_time = order.colour_flag_update_time;
|
||||
orderExist.supplier_remark_exception = order.supplier_remark_exception;
|
||||
orderExist.gift_order_status = order.gift_order_status;
|
||||
orderExist.shop_remark = order.shop_remark;
|
||||
orderExist.soft_remark = order.soft_remark;
|
||||
orderExist.out_amount = order.out_amount;
|
||||
orderExist.out_account = order.out_account;
|
||||
orderExist.out_order_no = order.out_order_no;
|
||||
orderExist.out_express_company = order.out_express_company;
|
||||
orderExist.out_express_no = order.out_express_no;
|
||||
orderExist.out_shipped = order.out_shipped;
|
||||
orderExist.is_shipment_optimized = order.is_shipment_optimized;
|
||||
orderExist.is_express_no_used = order.is_express_no_used;
|
||||
orderExist.out_after_sale_status = order.out_after_sale_status;
|
||||
orderExist.has_freight_insurance = order.has_freight_insurance;
|
||||
orderExist.freight_insurance_amount = order.freight_insurance_amount;
|
||||
orderExist.external_gift = order.external_gift;
|
||||
orderExist.transfer_warehouse_status = order.transfer_warehouse_status;
|
||||
orderExist.postage_price = order.postage_price;
|
||||
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
var itemExist = orderExist.OrderItems.FirstOrDefault(oi => oi.sku_id == item.sku_id);
|
||||
if (itemExist == null)
|
||||
orderExist.OrderItems.Add(item);
|
||||
else
|
||||
{
|
||||
itemExist.merchant_id = item.merchant_id;
|
||||
itemExist.order_id = item.order_id;
|
||||
itemExist.product_id = item.product_id;
|
||||
itemExist.sku_id = item.sku_id;
|
||||
itemExist.thumb_img = item.thumb_img;
|
||||
itemExist.sku_cnt = item.sku_cnt;
|
||||
itemExist.sale_price = item.sale_price;
|
||||
itemExist.title = item.title;
|
||||
itemExist.on_aftersale_sku_cnt = item.on_aftersale_sku_cnt;
|
||||
itemExist.finish_aftersale_sku_cnt = item.finish_aftersale_sku_cnt;
|
||||
itemExist.sku_code = item.sku_code;
|
||||
itemExist.market_price = item.market_price;
|
||||
itemExist.sku_attrs = item.sku_attrs;
|
||||
itemExist.real_price = item.real_price;
|
||||
itemExist.out_product_id = item.out_product_id;
|
||||
itemExist.purchase_price = item.purchase_price;
|
||||
itemExist.freight = item.freight;
|
||||
itemExist.out_sku_id = item.out_sku_id;
|
||||
itemExist.is_discounted = item.is_discounted;
|
||||
itemExist.estimate_price = item.estimate_price;
|
||||
itemExist.is_change_price = item.is_change_price;
|
||||
itemExist.change_price = item.change_price;
|
||||
itemExist.cash_coupon_discounted_price = item.cash_coupon_discounted_price;
|
||||
itemExist.out_warehouse_id = item.out_warehouse_id;
|
||||
itemExist.return_address = item.return_address;
|
||||
itemExist.sku_deliver_info = item.sku_deliver_info;
|
||||
itemExist.extra_service = item.extra_service;
|
||||
itemExist.use_deduction = item.use_deduction;
|
||||
itemExist.deduction_price = item.deduction_price;
|
||||
itemExist.predict_commission_fee = item.predict_commission_fee;
|
||||
itemExist.commission_amount = item.commission_amount;
|
||||
itemExist.order_product_coupon_info_list = item.order_product_coupon_info_list;
|
||||
itemExist.erp_goods_id = item.erp_goods_id;
|
||||
itemExist.erp_goods_sku_id = item.erp_goods_sku_id;
|
||||
itemExist.refund_status = item.refund_status;
|
||||
itemExist.predict_commission_fee = item.predict_commission_fee;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//var existOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
//var updateOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
//var orderIdList = existOrderIdList;
|
||||
//orderIdList.AddRange(updateOrderIdList);
|
||||
var orderIdList = GlobalConfig.lstOrder.ToList().Select(o => o.order_id).Distinct().ToList();
|
||||
|
||||
while(orderIdList.Count > 0 )
|
||||
{
|
||||
var orderIdTake = orderIdList.Take(500).ToList();
|
||||
var orderIdTake = orderIdList.Take(200).ToList();
|
||||
orderIdList.RemoveAll(o => orderIdTake.Contains(o));
|
||||
|
||||
var orderIds = string.Join(",", orderIdTake);
|
||||
|
||||
var order_ids = string.Join(",", orderIdTake);
|
||||
var orders = GlobalConfig.lstOrder.Where(o => orderIdTake.Contains(o.order_id)).ToList();
|
||||
|
||||
await Task.Delay(200);
|
||||
|
||||
// 读取售后单
|
||||
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
|
||||
|
||||
// 读订单扩展
|
||||
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
|
||||
|
||||
// 读取中转仓拍单订单
|
||||
var transitOrderList = await OrderGetOrderListHelper.GetTransitWarehouseList(order_ids);
|
||||
|
||||
// 额外订单包裹补发
|
||||
var transitExtraPackageList = await OrderGetOrderListHelper.GetTransitExtraPackageList(order_ids);
|
||||
|
||||
// 读取中转仓拍单订单售后状态
|
||||
var transitAfterSaleList = await OrderGetOrderListHelper.GetTransitWarehouseAfterSaleList(order_ids);
|
||||
|
||||
// 读取分销退货(中转仓退货)订单
|
||||
var transitReturnOrderList = await OrderGetOrderListHelper.GetTransitReturnOrderList(order_ids);
|
||||
|
||||
// 读取暂时记录的买手订单,后面想办法放到中转订单库里去
|
||||
var pddBuyerOrders = await OrderGetOrderListHelper.GetPddBuyerOrders(order_ids);
|
||||
// 读取暂时记录的淘宝买手订单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
||||
pddBuyerOrders.AddRange(await OrderGetOrderListHelper.GetTbBuyerOrders(order_ids));
|
||||
|
||||
// 读取暂时记录的买手售后单,后面想办法放到中转订单库里去
|
||||
var pddBuyerAfterSales = await OrderGetOrderListHelper.GetPddBuyerAfterSales(order_ids);
|
||||
// 读取暂时记录的淘宝买手售后单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
||||
pddBuyerAfterSales.AddRange(await OrderGetOrderListHelper.GetTbBuyerAfterSales(order_ids));
|
||||
|
||||
// 同步单
|
||||
var buyerOrderIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
||||
var syncLogistics = await OrderGetOrderListHelper.GetSyncLogistics(buyerOrderIds);
|
||||
|
||||
var orderItemsTmp = new List<oms_wei_order_item_info>();
|
||||
foreach (var o in orders) { orderItemsTmp.AddRange(o.OrderItems.ToList()); }
|
||||
// 读取关联拍单商品
|
||||
var buyMapList = await OrderGetOrderListHelper.GetBuyProdMap(orderItemsTmp);
|
||||
// 读取关联拍单的所有sku
|
||||
var buyMapSkusList = await OrderGetOrderListHelper.GetBuyProdMapSkus(orderItemsTmp);
|
||||
|
||||
// 读取物流轨迹
|
||||
var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids);
|
||||
|
||||
// 装载订单
|
||||
foreach (var order in orders)
|
||||
{
|
||||
try
|
||||
{
|
||||
//装载订单商品详情
|
||||
//order.OrderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||
var orderItems = order.OrderItems;
|
||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||
{
|
||||
// 订单商品
|
||||
//item.ItemOrder = order;
|
||||
//order.OrderItems.Add(item);
|
||||
|
||||
// 扩展订单信息
|
||||
if (orderItemExts.FirstOrDefault(ext => ext.order_id == item.order_id && item.sku_id == item.sku_id) is order_item_ext ext)
|
||||
item.OrderItemExt = ext;
|
||||
|
||||
// 关联拍单关系 拼多多 // 危险物品禁止拍单,仅关联安全商品
|
||||
//if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
||||
{
|
||||
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
|
||||
var pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (pddBuyMap == null)
|
||||
pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (pddBuyMap == null)
|
||||
pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (pddBuyMap == null)
|
||||
pddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
if (pddBuyMap != null)
|
||||
item.PddBuyMap = pddBuyMap;
|
||||
}
|
||||
if (item.PddBuyMapSkus == null)
|
||||
item.PddBuyMapSkus = new List<WXBuyMapSkusInfo>();
|
||||
var pddBuyMapSkus = buyMapSkusList.Where(s => s.spu_code == item.out_product_id || s.spu_code == item.product_id).OrderByDescending(s => s.mdy_time)
|
||||
.Where(s => s.platform == "pdd").ToList();
|
||||
if (pddBuyMapSkus.Count > 0)
|
||||
{
|
||||
pddBuyMapSkus.AddRange(item.PddBuyMapSkus.ToList().Where(ims => !pddBuyMapSkus.Any(ms => ms.spu_code == ims.spu_code)));
|
||||
item.PddBuyMapSkus = pddBuyMapSkus.OrderByDescending(s => s.mdy_time).ToList();
|
||||
}
|
||||
|
||||
// 关联拍单关系 淘宝
|
||||
{
|
||||
var tbBuyMapLst = buyMapList.Where(m => m.platform == "tb").ToList();
|
||||
var tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
if (tbBuyMap == null)
|
||||
tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
if (tbBuyMap == null)
|
||||
tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
if (tbBuyMap == null)
|
||||
tbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
if (tbBuyMap != null)
|
||||
item.TbBuyMap = tbBuyMap;
|
||||
}
|
||||
if (item.TbBuyMapSkus == null)
|
||||
item.TbBuyMapSkus = new List<WXBuyMapSkusInfo>();
|
||||
var tbBuyMapSkus = buyMapSkusList.Where(s => s.spu_code == item.out_product_id || s.spu_code == item.product_id).OrderByDescending(s => s.mdy_time)
|
||||
.Where(s => s.platform == "tb").ToList();
|
||||
if (tbBuyMapSkus.Count > 0)
|
||||
{
|
||||
tbBuyMapSkus.AddRange(item.TbBuyMapSkus.ToList().Where(ims => !tbBuyMapSkus.Any(ms => ms.spu_code == ims.spu_code)));
|
||||
item.TbBuyMapSkus = tbBuyMapSkus;
|
||||
}
|
||||
|
||||
// 中转仓订单
|
||||
if (item.ItemTransitOrders == null)
|
||||
item.ItemTransitOrders = new List<oms_wei_external_procurement_log_info>();
|
||||
var itemTransitOrders = transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id).ToList();
|
||||
if (itemTransitOrders.Count > 0)
|
||||
{
|
||||
itemTransitOrders.AddRange(item.ItemTransitOrders.ToList().Where(ito => !itemTransitOrders.Any(to => to.order_no == ito.order_no && to.order_sku_id == ito.order_sku_id)));
|
||||
item.ItemTransitOrders = itemTransitOrders.OrderByDescending(ito => ito.id).ToList();
|
||||
}
|
||||
// 中转仓售后单
|
||||
if (item.ItemTransitOrderAfterSales == null)
|
||||
item.ItemTransitOrderAfterSales = new List<oms_wei_external_procurement_after_sale_info>();
|
||||
var itemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code || t.order_code == a.order_code)).ToList();
|
||||
if (itemTransitOrderAfterSales.Count > 0)
|
||||
{
|
||||
transitAfterSaleList.AddRange(item.ItemTransitOrderAfterSales.ToList().Where(iaf => !itemTransitOrderAfterSales.Any(af => af.order_code == iaf.order_code)));
|
||||
item.ItemTransitOrderAfterSales = transitAfterSaleList.OrderByDescending(iaf => iaf.id).ToList();
|
||||
}
|
||||
// 中转仓额外单
|
||||
if (item.ItemTransitExtraOrders == null)
|
||||
item.ItemTransitExtraOrders = new List<oms_wei_transfer_extra_package>();
|
||||
var itemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList();
|
||||
if (itemTransitExtraOrders.Count > 0)
|
||||
{
|
||||
itemTransitExtraOrders.AddRange(item.ItemTransitExtraOrders.ToList().Where(ite => !itemTransitExtraOrders.Any(te => te.order_code == ite.order_code)));
|
||||
item.ItemTransitExtraOrders = itemTransitExtraOrders.OrderByDescending(ite => ite.id).ToList();
|
||||
}
|
||||
// 分销退货包裹
|
||||
if (item.DistribReturnOrderInfos == null)
|
||||
item.DistribReturnOrderInfos = new List<distrib_return_order_info>();
|
||||
var distribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();
|
||||
if (distribReturnOrderInfos.Count > 0)
|
||||
{
|
||||
distribReturnOrderInfos.AddRange(item.DistribReturnOrderInfos.ToList().Where(iro => !distribReturnOrderInfos.Any(ro => ro.order_code_source == iro.order_code_source)));
|
||||
item.DistribReturnOrderInfos = distribReturnOrderInfos.OrderByDescending(itr => itr.id).ToList();
|
||||
}
|
||||
|
||||
// 中转仓买手订单(wx_send_type等于0)
|
||||
if (item.PddBuyerOrders == null)
|
||||
item.PddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||
var transitPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||
if (transitPddBuyerOrders.Count > 0)
|
||||
{
|
||||
transitPddBuyerOrders.AddRange(item.PddBuyerOrders.ToList().Where(ioo => !transitPddBuyerOrders.Any(oo => oo.order_sn == ioo.order_sn)));
|
||||
item.PddBuyerOrders = transitPddBuyerOrders.OrderByDescending(ioo => ioo.add_time).ToList();
|
||||
}
|
||||
// 中转仓买手退货订单(wx_send_type等于0)
|
||||
if (item.PddBuyerAfterSales == null)
|
||||
item.PddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||
var transitPddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||
if (transitPddBuyerAfterSales.Count > 0)
|
||||
{
|
||||
transitPddBuyerAfterSales.AddRange(item.PddBuyerAfterSales.Where(iaf => !transitPddBuyerAfterSales.Any(af => af.orderSn == iaf.orderSn)));
|
||||
item.PddBuyerAfterSales = transitPddBuyerAfterSales.OrderByDescending(iaf => iaf.id).ToList();
|
||||
}
|
||||
// 直发买手订单(wx_send_type等于1)
|
||||
if (item.DirectPddBuyerOrders == null)
|
||||
item.DirectPddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||
var directPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList();
|
||||
if (directPddBuyerOrders.Count > 0)
|
||||
{
|
||||
directPddBuyerOrders.AddRange(item.DirectPddBuyerOrders.ToList().Where(ioo => !transitPddBuyerOrders.Any(oo => oo.order_sn == ioo.order_sn)));
|
||||
item.DirectPddBuyerOrders = directPddBuyerOrders.OrderByDescending(ioo => ioo.add_time).ToList();
|
||||
}
|
||||
|
||||
// 直发买手退款订单(wx_send_type等于1)
|
||||
item.DirectPddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList();
|
||||
}
|
||||
|
||||
// 装载订单售后详情
|
||||
order.RefundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
||||
|
||||
// 装载同步单
|
||||
order.SyncLogisticsList = [.. syncLogistics.Where(os => order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))),];
|
||||
|
||||
// 装载订单物流最后一条信息
|
||||
order.LatestEWaybills = [.. ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong())];
|
||||
|
||||
// 读取订单后立即赋值,防止滚动时实时赋值造成卡顿
|
||||
OrderListCtrl.InitOrderObservableProp(order);
|
||||
|
||||
//// 删除再添加,触发更新。 todo: 如果已存在相同订单,则直接修改更新
|
||||
//var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
//while (orderExist != null)
|
||||
//{
|
||||
// GlobalConfig.lstOrder.Remove(orderExist);
|
||||
// orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
|
||||
//}
|
||||
//GlobalConfig.lstOrder.Add(order);
|
||||
await FilterIncrementOrder(order);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static async Task FilterIncrementOrder(oms_wei_order_info order, bool updateTabCount = false)
|
||||
{
|
||||
if (order == null)
|
||||
return;
|
||||
|
||||
oms_wei_order_info orderExist = null;
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
|
||||
if (!MainWindow.Instance.orderListCtrl.GetOrderIsFilter(order))
|
||||
{
|
||||
if (orderExist == null)
|
||||
{
|
||||
var index = -1;
|
||||
oms_wei_order_info nextOrder = null;
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.RefundDatetime < order.RefundDatetime);
|
||||
else if (GlobalConfig.OrderTabHeaderStr.StartsWith("异常需重拍"))
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.update_time < order.update_time);
|
||||
else
|
||||
nextOrder = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.create_time < order.create_time);
|
||||
|
||||
if (nextOrder != null)
|
||||
index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
|
||||
}
|
||||
await MainWindow.Instance.orderListCtrl.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Insert(index, order);
|
||||
}
|
||||
else
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Add(order);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
Thread.Sleep(1);
|
||||
}
|
||||
else
|
||||
{
|
||||
while (orderExist != null)
|
||||
{
|
||||
await MainWindow.Instance.orderListCtrl.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(orderExist);
|
||||
}
|
||||
});
|
||||
lock (MainWindow._orderLock)
|
||||
{
|
||||
orderExist = GlobalConfig.lstFilterOrder.ToList().FirstOrDefault(o => o.order_id == order.order_id);
|
||||
}
|
||||
}
|
||||
Thread.Sleep(1);
|
||||
}
|
||||
|
||||
|
||||
if (updateTabCount)
|
||||
{
|
||||
await MainWindow.Instance.orderListCtrl.disPlayOrderTabOrderCount();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -55,7 +471,13 @@ public class OrderGetOrderListHelper
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
|
||||
{
|
||||
return await GetOrderInfoBase(order_ids);
|
||||
return (await GetOrderInfoBase(order_ids)).OrderList;
|
||||
}
|
||||
|
||||
public class ErpOrderInfo
|
||||
{
|
||||
public int PageCount { get; set; } = 0;
|
||||
public List<oms_wei_order_info> OrderList { get; set; } = new List<oms_wei_order_info> { };
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -63,10 +485,11 @@ public class OrderGetOrderListHelper
|
||||
/// </summary>
|
||||
/// <param name="orderIds"></param>
|
||||
/// <returns></returns>
|
||||
static async Task<List<oms_wei_order_info>> GetOrderInfoBase(string orderIds, int pageSize = 100, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null)
|
||||
static async Task<ErpOrderInfo> GetOrderInfoBase(string orderIds, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null,
|
||||
int page = 1, int pageSize = 100, bool isGetCount = false)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
return new List<oms_wei_order_info>();
|
||||
if (string.IsNullOrEmpty(orderIds) && string.IsNullOrEmpty(shopIds))
|
||||
return new ErpOrderInfo();
|
||||
|
||||
Thread.Sleep(100);
|
||||
try
|
||||
@@ -75,6 +498,9 @@ public class OrderGetOrderListHelper
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&erp_order_id_in=" + orderIds;
|
||||
data += "&page_size=" + pageSize;
|
||||
data += "&page=" + page;
|
||||
if (isGetCount == false)
|
||||
data += "&is_not_count=true";
|
||||
if (!string.IsNullOrWhiteSpace(shopIds))
|
||||
data += "&erp_shop_id_in=" + shopIds;
|
||||
if (beginUpdateTime != null && beginUpdateTime != DateTime.MinValue)
|
||||
@@ -99,19 +525,30 @@ public class OrderGetOrderListHelper
|
||||
if (orders == null)
|
||||
orders = new List<oms_wei_order_info>();
|
||||
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
orderIds = string.Join(",", orders.Select(o => o.order_id));
|
||||
var orderItems = await GetOrderItemInfo(orderIds);
|
||||
foreach (var orderItem in orderItems)
|
||||
//foreach (var orderItem in orderItems)
|
||||
//{
|
||||
// var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
// orderItem.ItemOrder = order;
|
||||
// order.OrderItems.Add(orderItem);
|
||||
//}
|
||||
foreach (var order in orders)
|
||||
{
|
||||
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
orderItem.ItemOrder = order;
|
||||
order.orderItems.Add(orderItem);
|
||||
order.OrderItems = new ObservableCollection<oms_wei_order_item_info>(orderItems.Where(ois => ois.order_id == order.order_id));
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
orderItem.ItemOrder = order;
|
||||
}
|
||||
}
|
||||
return orders;
|
||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||
return new ErpOrderInfo() { OrderList = orders, PageCount = (totalCount > 0) ? Math.Ceiling(1m * totalCount / pageSize).ParseToInt() : -1 };
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
return new List<oms_wei_order_info>();
|
||||
return new ErpOrderInfo();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,9 +594,9 @@ public class OrderGetOrderListHelper
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_refund_info>();
|
||||
Thread.Sleep(100);
|
||||
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
|
||||
var data2 = UserLogin.GetSignaturex();
|
||||
data2 += "&erp_order_id_in=" + order_ids;
|
||||
@@ -183,6 +620,7 @@ public class OrderGetOrderListHelper
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
|
||||
if (!string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
@@ -544,4 +982,91 @@ public class OrderGetOrderListHelper
|
||||
}
|
||||
return new List<oms_wei_ewaybill_path>();
|
||||
}
|
||||
|
||||
public static async Task<List<WXBuyMapInfo>> GetBuyProdMap(List<oms_wei_order_item_info> orderItems)
|
||||
{
|
||||
//foreach (var item in orderItems.ToList())
|
||||
//{
|
||||
// var buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||
// if (buyMap == null)
|
||||
// buyMap = GlobalConfig.BuyMapList.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||
|
||||
// if (buyMap != null)
|
||||
// orderItems.Remove(item);
|
||||
//}
|
||||
if (orderItems == null || orderItems.Count == 0)
|
||||
{
|
||||
return new List<WXBuyMapInfo>();
|
||||
}
|
||||
|
||||
var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", orderItems.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id)).Distinct()) + "," +
|
||||
string.Join(",", orderItems.Select(oi => oi.product_id).Distinct());
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultMap = await GetHtml.PostUtf8Async(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
resultMap = await GetHtml.PostUtf8Async(urlMap, dataMap);
|
||||
if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单关联读取失败 " + BaseRegex.GetStringJson(ref resultMap, "msg"), "Error", 5);
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
var buyMapList = JsonHelper.DeserializeJsonToList<WXBuyMapInfo>(JObject.Parse(resultMap)["data"].ParseToString());
|
||||
buyMapList = buyMapList.Where(b => !GlobalConfig.BuyMapList.Any(m => m.sku_code == b.sku_code && m.spu_code == b.spu_code)).ToList();
|
||||
GlobalConfig.BuyMapList.AddRange(buyMapList);
|
||||
if (buyMapList.Count > 0)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<WXBuyMapInfo>();
|
||||
}
|
||||
}
|
||||
return GlobalConfig.BuyMapList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
|
||||
public static async Task<List<WXBuyMapSkusInfo>> GetBuyProdMapSkus(List<oms_wei_order_item_info> orderItems)
|
||||
{
|
||||
var ois = orderItems?.Where(oi => !GlobalConfig.BuyMapSkusList.Any(bm => bm.spu_code == oi.out_product_id || bm.spu_code == oi.product_id)).ToList();
|
||||
if (ois == null || ois.Count == 0)
|
||||
{
|
||||
return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_buy_pord_map_skus");
|
||||
var dataMap = UserLogin.GetSignaturex()
|
||||
+ "&spu_codes=" + string.Join(",", ois.Select(oi => GetHtml.UrlEncodeUtf8(oi.out_product_id)).Distinct()) + "," + string.Join(",", ois.Select(oi => oi.product_id).Distinct());
|
||||
dataMap += "&main_user_name=" + BaseClass.MainUserName;
|
||||
var resultSkusMap = await GetHtml.PostUtf8Async(url, dataMap);
|
||||
if (string.IsNullOrEmpty(resultSkusMap) || !resultSkusMap.Contains("\"code\":200"))
|
||||
{
|
||||
resultSkusMap = await GetHtml.PostUtf8Async(url, dataMap);
|
||||
}
|
||||
if (string.IsNullOrEmpty(resultSkusMap) || !resultSkusMap.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单关联列表读取失败 " + BaseRegex.GetStringJson(ref resultSkusMap, "msg"), "Error", 5);
|
||||
return new List<WXBuyMapSkusInfo>();
|
||||
}
|
||||
try
|
||||
{
|
||||
var buyMapSkusList = JsonHelper.DeserializeJsonToList<WXBuyMapSkusInfo>(JObject.Parse(resultSkusMap)["data"].ParseToString());
|
||||
buyMapSkusList = buyMapSkusList.Where(b => !GlobalConfig.BuyMapSkusList.Any(m => m.map_goods_id == b.map_goods_id)).ToList();
|
||||
GlobalConfig.BuyMapSkusList.AddRange(buyMapSkusList);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return new List<WXBuyMapSkusInfo>();
|
||||
}
|
||||
return GlobalConfig.BuyMapSkusList.Where(m => orderItems.Any(oi => m.spu_code == oi.out_product_id || m.spu_code == oi.product_id)).ToList();
|
||||
}
|
||||
}
|
||||
@@ -83,7 +83,7 @@ public partial class OrderListCtrl
|
||||
{
|
||||
sucessCount++;
|
||||
item.gift_order_status = 1;
|
||||
foreach (var orderItem in item.orderItems)
|
||||
foreach (var orderItem in item.OrderItems)
|
||||
{
|
||||
InitOrderItemObservableProp(orderItem);
|
||||
}
|
||||
@@ -109,7 +109,7 @@ public partial class OrderListCtrl
|
||||
}
|
||||
|
||||
SetProgress(index, count);
|
||||
BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}";
|
||||
BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}";
|
||||
index++;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ public partial class OrderListCtrl
|
||||
{
|
||||
errorCount++;
|
||||
}
|
||||
BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}";
|
||||
BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}";
|
||||
index++;
|
||||
}
|
||||
BottomMsg = $"订单同步进度完成 成功:{sucessCount} 失败:{errorCount} 总数:{count}";
|
||||
@@ -203,7 +203,7 @@ public partial class OrderListCtrl
|
||||
{
|
||||
long shopid = item.Key;
|
||||
string shopName = item.Value.FirstOrDefault()?.shop_name ?? "";
|
||||
string[] afterSaleOrderIds = item.Value.SelectMany(a => a.refundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray();
|
||||
string[] afterSaleOrderIds = item.Value.SelectMany(a => a.RefundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray();
|
||||
var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(shopid, afterSaleOrderIds);
|
||||
if (ret)
|
||||
{
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -51,23 +51,23 @@
|
||||
</Grid.RowDefinitions>
|
||||
<local:OrderListRowItemCtrl
|
||||
Grid.Row="1"
|
||||
DataContext="{Binding orderItem}"
|
||||
DataContext="{Binding OrderItem}"
|
||||
Visibility="{Binding OrderItemVisibility}" />
|
||||
<!--<local:OrderListRowItemCtrl
|
||||
Grid.Row="2"
|
||||
DataContext="{Binding orderItem2}"
|
||||
DataContext="{Binding OrderItem2}"
|
||||
Visibility="{Binding OrderItemVisibility}" />
|
||||
<local:OrderListRowItemCtrl
|
||||
Grid.Row="3"
|
||||
DataContext="{Binding orderItem2}"
|
||||
DataContext="{Binding OrderItem2}"
|
||||
Visibility="{Binding OrderItemVisibility}" />
|
||||
<local:OrderListRowItemCtrl
|
||||
Grid.Row="4"
|
||||
DataContext="{Binding orderItem3}"
|
||||
DataContext="{Binding OrderItem3}"
|
||||
Visibility="{Binding OrderItemVisibility}" />
|
||||
<local:OrderListRowItemCtrl
|
||||
Grid.Row="5"
|
||||
DataContext="{Binding orderItem4}"
|
||||
DataContext="{Binding OrderItem4}"
|
||||
Visibility="{Binding OrderItemVisibility}" />-->
|
||||
<!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
|
||||
<ItemsControl.ItemTemplate>
|
||||
@@ -78,7 +78,7 @@
|
||||
</ItemsControl>-->
|
||||
<!--<ListBox
|
||||
Grid.Row="1"
|
||||
ItemsSource="{Binding orderItems}"
|
||||
ItemsSource="{Binding OrderItems}"
|
||||
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
||||
ScrollViewer.VerticalScrollBarVisibility="Disabled"
|
||||
VirtualizingStackPanel.IsVirtualizing="True"
|
||||
|
||||
@@ -89,7 +89,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
|
||||
{
|
||||
// 更新代发管理情况
|
||||
foreach (var orderItem in ord.orderItems)
|
||||
foreach (var orderItem in ord.OrderItems)
|
||||
Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
|
||||
}
|
||||
}
|
||||
@@ -121,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_info order)
|
||||
{
|
||||
if (order.orderItems.Count > 5)
|
||||
if (order.OrderItems.Count > 5)
|
||||
{
|
||||
//txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
|
||||
}
|
||||
|
||||
@@ -349,7 +349,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError("请选择买手号");
|
||||
return;
|
||||
}
|
||||
if (orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
{
|
||||
if (!isAutoBuy)
|
||||
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
|
||||
@@ -357,7 +357,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
var oldVisibility = orderItem.BtnAbnormalOrderRebuyVisibility;
|
||||
if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.orderItems
|
||||
if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.OrderItems
|
||||
.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
|
||||
{
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
@@ -374,10 +374,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var skuId = orderItem.sku_id;
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
if (newOrder.OrderItems.Count == 1)
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
if (orderItem == null)
|
||||
return;
|
||||
if (isAbnormalOrder)
|
||||
@@ -515,7 +515,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == orderItem.ItemOrder?.Shop?.ErpShopId).ToList())
|
||||
{
|
||||
// 更新代发管理情况
|
||||
foreach (var oi in ord.orderItems)
|
||||
foreach (var oi in ord.OrderItems)
|
||||
MainWindow.Instance.Dispatcher.Invoke(new Action(() => { oi.UpdateOrderItemBuyButton(); }));
|
||||
}
|
||||
BaseMsgWindow.ShowError("请登录店铺");
|
||||
@@ -1302,7 +1302,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError("请选择买手号");
|
||||
return;
|
||||
}
|
||||
if (/*orderItem.sku_cnt > 1 ||*/ orderItem.ItemOrder.orderItems.Count > 1)
|
||||
if (/*orderItem.sku_cnt > 1 ||*/ orderItem.ItemOrder.OrderItems.Count > 1)
|
||||
{
|
||||
//BaseMsgWindow.ShowError("多子单或多件商品订单中转仓暂不支持");
|
||||
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
|
||||
@@ -1323,10 +1323,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
var skuId = orderItem.sku_id;
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
if (newOrder?.OrderItems.Count == 1)
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
if (orderItem == null)
|
||||
return;
|
||||
orderItem.BtnAbnormalOrderRebuyVisibility = oldVisibility;
|
||||
|
||||
@@ -197,7 +197,7 @@ public partial class OrderTransitListDetailCtrl : UserControl
|
||||
{
|
||||
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
|
||||
{
|
||||
OrderItem = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderItem?.order_id)?.orderItems.FirstOrDefault(oi => oi.sku_id == orderItem?.sku_id),
|
||||
OrderItem = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderItem?.order_id)?.OrderItems.FirstOrDefault(oi => oi.sku_id == orderItem?.sku_id),
|
||||
};
|
||||
transitListCtrl.UpdateViewModel(transitInfo);
|
||||
}
|
||||
|
||||
@@ -42,10 +42,10 @@ internal class OrderTransitService
|
||||
await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(orderId); });
|
||||
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
if (newOrder?.OrderItems.Count == 1)
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
|
||||
if (orderItem == null)
|
||||
{
|
||||
|
||||
@@ -48,7 +48,7 @@ public partial class SettingsView : Window
|
||||
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||
|
||||
@@ -347,7 +347,7 @@ namespace _29WxOrderWpf
|
||||
foreach (var order in orders)
|
||||
{
|
||||
// 更新代发管理情况
|
||||
foreach (var orderItem in order.orderItems)
|
||||
foreach (var orderItem in order.OrderItems)
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
//Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
|
||||
giftType = GiftType._160;
|
||||
giftAmount = 1.6m;
|
||||
}
|
||||
decimal amount = giftAmount + BaseClass.OemGiftAmount;
|
||||
decimal amount = giftAmount + BaseClass.OemGiftAmount + BaseClass.ParentOemGiftAmount;
|
||||
|
||||
|
||||
string province = item.province_name;
|
||||
@@ -81,7 +81,7 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
|
||||
// amount = (int)(amount * 100),
|
||||
// oemAmount = (int)(BaseClass.OemGiftAmount * 100)
|
||||
//});
|
||||
var ret = await _api.SendShipGift([orderId], (int)giftType, amount, BaseClass.OemGiftAmount);
|
||||
var ret = await _api.SendShipGift([orderId], (int)giftType, amount, BaseClass.OemGiftAmount, BaseClass.ParentOemGiftAmount, BaseClass.OemId, BaseClass.ParentOemId);
|
||||
return ret;
|
||||
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ using AllBase.Helper;
|
||||
using AllBase.Model.Config;
|
||||
using AllBase.Model.DBModel;
|
||||
using NaiBa.Util;
|
||||
using NaiBa.Util.Extension;
|
||||
using NaiBa.Util.Helper;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
@@ -66,7 +67,73 @@ namespace _29WxOrderWpf
|
||||
BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
|
||||
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
|
||||
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
|
||||
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
||||
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
||||
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
|
||||
}
|
||||
}
|
||||
public static async Task GetOemAmount(int type)
|
||||
{
|
||||
var url3 = BaseClass.Build29WxObjString("user/GetUserMarkups");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&PaymentType=" + type;
|
||||
var html = await GetHtml.PostUtf8Async(url3, data3);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = await GetHtml.PostUtf8Async(url3, data3);
|
||||
if (html.Contains("\"code\":200"))
|
||||
{
|
||||
try
|
||||
{
|
||||
var jArr = AllBase.JsonHelper.JObjectParse(html)["data"] as JArray;
|
||||
foreach (var r in jArr)
|
||||
{
|
||||
if (type == 16)
|
||||
{
|
||||
if (jArr["level"].ParseToInt() == 1)
|
||||
{
|
||||
BaseClass.ParentOemId = jArr["oemId"].ParseToString();
|
||||
BaseClass.ParentOemGiftAmount = jArr["markup"].ParseToInt() * 0.01m;
|
||||
}
|
||||
else if (jArr["level"].ParseToInt() == 2)
|
||||
{
|
||||
BaseClass.OemId = jArr["oemId"].ParseToString();
|
||||
BaseClass.OemGiftAmount = jArr["markup"].ParseToInt() * 0.01m;
|
||||
}
|
||||
}
|
||||
else if (type == 20)
|
||||
{
|
||||
if (jArr["level"].ParseToInt() == 1)
|
||||
{
|
||||
BaseClass.ParentOemId = jArr["oemId"].ParseToString();
|
||||
BaseClass.ParentPostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
|
||||
}
|
||||
else if (jArr["level"].ParseToInt() == 2)
|
||||
{
|
||||
BaseClass.OemId = jArr["oemId"].ParseToString();
|
||||
BaseClass.PostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
|
||||
}
|
||||
}
|
||||
else if (type == 26)
|
||||
{
|
||||
if (jArr["level"].ParseToInt() == 1)
|
||||
{
|
||||
BaseClass.ParentOemId = jArr["oemId"].ParseToString();
|
||||
BaseClass.ParentRefundPostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
|
||||
}
|
||||
else if (jArr["level"].ParseToInt() == 2)
|
||||
{
|
||||
BaseClass.OemId = jArr["oemId"].ParseToString();
|
||||
BaseClass.RefundPostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new Exception(ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -236,7 +236,7 @@ public class BuyMapSkuViewModel : PropertyNotifyObject
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if ((item.out_product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
|
||||
(item.out_product_id == map.spu_code && item.SkuAttrStr == map.sku_code) ||
|
||||
|
||||
@@ -119,8 +119,11 @@ namespace _29WxOrderWpf.ViewModels
|
||||
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (OrderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
JObject body = new JObject();
|
||||
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
body["parentOemId"] = BaseClass.ParentOemId;
|
||||
body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["oemId"] = BaseClass.OemId;
|
||||
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
|
||||
body["packType"] = "2";
|
||||
body["batchId"] = TransitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
|
||||
|
||||
@@ -102,7 +102,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
|
||||
if (order != null)
|
||||
{
|
||||
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
var orderItemTmp = order.OrderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
if (orderItemTmp != null)
|
||||
OrderItem = orderItemTmp;
|
||||
}
|
||||
@@ -166,7 +166,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
|
||||
if (order != null)
|
||||
{
|
||||
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
var orderItemTmp = order.OrderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
if (orderItemTmp != null)
|
||||
OrderItem = orderItemTmp;
|
||||
}
|
||||
@@ -241,8 +241,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
|
||||
|
||||
data["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
data["postage"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
data["parentOemId"] = BaseClass.ParentOemId;
|
||||
data["parentOemAmount"] = (BaseClass.ParentRefundPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
data["oemId"] = BaseClass.OemId;
|
||||
data["oemAmount"] = (BaseClass.RefundPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
data["postage"] = ((basePostage + BaseClass.ParentRefundPostageOemAmount + BaseClass.RefundPostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
}
|
||||
|
||||
var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage";
|
||||
|
||||
@@ -184,8 +184,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
|
||||
|
||||
jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
jObj["parentOemId"] = BaseClass.ParentOemId;
|
||||
jObj["parentOemAmount"] = (BaseClass.ParentRefundPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
jObj["oemId"] = BaseClass.OemId;
|
||||
jObj["oemAmount"] = (BaseClass.RefundPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
jObj["firstWeightFee"] = ((basePostage + BaseClass.ParentRefundPostageOemAmount + BaseClass.RefundPostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
|
||||
JObject jItemObj = new JObject();
|
||||
jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
|
||||
@@ -310,8 +313,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
|
||||
|
||||
jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
jObj["parentOemId"] = BaseClass.ParentOemId;
|
||||
jObj["parentOemAmount"] = (BaseClass.ParentRefundPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
jObj["oemId"] = BaseClass.OemId;
|
||||
jObj["oemAmount"] = (BaseClass.RefundPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
jObj["firstWeightFee"] = ((basePostage + BaseClass.ParentRefundPostageOemAmount + BaseClass.RefundPostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
|
||||
JObject jItemObj = new JObject();
|
||||
jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
|
||||
|
||||
+19
-3
@@ -22,6 +22,8 @@ namespace AllBase
|
||||
#region oem贴牌参数
|
||||
public static string OemId { get; set; } = "";
|
||||
public static string OemName { get; set; } = "";
|
||||
public static string ParentOemId { get; set; } = "";
|
||||
public static string ParentOemName { get; set; } = "";
|
||||
public static bool IsOemOwner { get; set; } = false;
|
||||
public static string AgentName { get; set; } = "";
|
||||
public static string AgentCode { get; set; } = "";
|
||||
@@ -31,13 +33,17 @@ namespace AllBase
|
||||
/// 礼品单oem额外价格
|
||||
/// </summary>
|
||||
public static decimal OemGiftAmount { get; set; } = 0;
|
||||
/// <summary>
|
||||
/// 礼品单一级代理oem额外价格
|
||||
/// </summary>
|
||||
public static decimal ParentOemGiftAmount { get; set; } = 0;
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 版本ID
|
||||
/// </summary>
|
||||
|
||||
public static int VersionCount = 392;
|
||||
public static int VersionCount = 392;
|
||||
|
||||
//public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||
public static string ServerUrl
|
||||
@@ -213,10 +219,20 @@ namespace AllBase
|
||||
public static int ShopPointsPerMonth { get; set; } = 30;
|
||||
public static decimal RechargeAmountTotal { get; set; } = 0;
|
||||
public static decimal Balance { get; set; } = 0;
|
||||
/// <summary>
|
||||
/// 发货每笔费用
|
||||
/// </summary>
|
||||
public static decimal PostagePerOrder { get; set; } = 2.2m;
|
||||
public static decimal PostagePerOrderDiff { get { return Math.Max(0, PostagePerOrder - 2.2m); } }
|
||||
static decimal? postageOemAmount = null;
|
||||
public static decimal PostageOemAmount { set { postageOemAmount = value; } get { return postageOemAmount ?? Math.Max(0, PostagePerOrder - 2.2m); } }
|
||||
public static decimal ParentPostageOemAmount { get; set; } = 0m;
|
||||
/// <summary>
|
||||
/// 退货每笔费用
|
||||
/// </summary>
|
||||
public static decimal RefundPostagePerOrder { get; set; } = 2.5m;
|
||||
public static decimal RefundPostagePerOrderDiff { get { return Math.Max(0, RefundPostagePerOrder - 2.5m); } }
|
||||
static decimal? refundPostageOemAmount = null;
|
||||
public static decimal RefundPostageOemAmount { set { refundPostageOemAmount = value; } get { return refundPostageOemAmount ?? Math.Max(0, RefundPostagePerOrder - 2.5m); } }
|
||||
public static decimal ParentRefundPostageOemAmount { get; set; } = 0m;
|
||||
public static int AlimamaPageCount = 0;
|
||||
public static bool CloudTitle = false;
|
||||
public static bool CloudBrand = false;
|
||||
|
||||
@@ -72,7 +72,7 @@ XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道
|
||||
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
|
||||
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头
|
||||
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司(仓库二楼)
|
||||
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐汇区徐家汇街道虹桥路616号A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
|
||||
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐汇区徐家汇街道虹桥路616号A座T区 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
|
||||
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼
|
||||
XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
|
||||
XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋";
|
||||
|
||||
@@ -57,36 +57,36 @@ namespace AllBase.Model.DBModel
|
||||
set { this.SetValue(x => x.OrderBuyTypeColor, value); }
|
||||
}
|
||||
|
||||
public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
|
||||
public oms_wei_order_item_info orderItem
|
||||
public ObservableCollection<oms_wei_order_item_info> OrderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
|
||||
public oms_wei_order_item_info OrderItem
|
||||
{
|
||||
get { return this.GetValue(x => x.orderItem); }
|
||||
set { this.SetValue(x => x.orderItem, value); }
|
||||
get { return this.GetValue(x => x.OrderItem); }
|
||||
set { this.SetValue(x => x.OrderItem, value); }
|
||||
}
|
||||
public oms_wei_order_item_info orderItem2
|
||||
public oms_wei_order_item_info OrderItem2
|
||||
{
|
||||
get { return this.GetValue(x => x.orderItem2); }
|
||||
set { this.SetValue(x => x.orderItem2, value); }
|
||||
get { return this.GetValue(x => x.OrderItem2); }
|
||||
set { this.SetValue(x => x.OrderItem2, value); }
|
||||
}
|
||||
public oms_wei_order_item_info orderItem3
|
||||
public oms_wei_order_item_info OrderItem3
|
||||
{
|
||||
get { return this.GetValue(x => x.orderItem3); }
|
||||
set { this.SetValue(x => x.orderItem3, value); }
|
||||
get { return this.GetValue(x => x.OrderItem3); }
|
||||
set { this.SetValue(x => x.OrderItem3, value); }
|
||||
}
|
||||
public oms_wei_order_item_info orderItem4
|
||||
public oms_wei_order_item_info OrderItem4
|
||||
{
|
||||
get { return this.GetValue(x => x.orderItem4); }
|
||||
set { this.SetValue(x => x.orderItem4, value); }
|
||||
get { return this.GetValue(x => x.OrderItem4); }
|
||||
set { this.SetValue(x => x.OrderItem4, value); }
|
||||
}
|
||||
public oms_wei_order_item_info orderItem5
|
||||
public oms_wei_order_item_info OrderItem5
|
||||
{
|
||||
get { return this.GetValue(x => x.orderItem5); }
|
||||
set { this.SetValue(x => x.orderItem5, value); }
|
||||
get { return this.GetValue(x => x.OrderItem5); }
|
||||
set { this.SetValue(x => x.OrderItem5, value); }
|
||||
}
|
||||
|
||||
public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
|
||||
public ObservableCollection<oms_wei_refund_info> RefundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
|
||||
|
||||
public ConcurrentList<oms_wei_ewaybill_path> latestEWaybills { get; set; } = new ConcurrentList<oms_wei_ewaybill_path>();
|
||||
public ConcurrentList<oms_wei_ewaybill_path> LatestEWaybills { get; set; } = new ConcurrentList<oms_wei_ewaybill_path>();
|
||||
|
||||
/// <summary>
|
||||
/// 待采购
|
||||
@@ -255,14 +255,14 @@ namespace AllBase.Model.DBModel
|
||||
}
|
||||
void SetDeliveryDeadlineStatusStr()
|
||||
{
|
||||
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
|
||||
if (this.RefundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
|
||||
DeliveryDeadlineStatusStr = "退款中";
|
||||
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
|
||||
else if (this.RefundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
|
||||
DeliveryDeadlineStatusStr = "退款完成";
|
||||
// 用户取消申请
|
||||
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
|
||||
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
|
||||
DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
|
||||
this.RefundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
|
||||
DeliveryDeadlineStatusStr = this.RefundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
|
||||
else if (this.status == 20 || this.status == 21)
|
||||
{
|
||||
DeliveryDeadlineStatusStr = "剩余";
|
||||
@@ -755,17 +755,17 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
|
||||
|
||||
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
|
||||
if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
|
||||
{
|
||||
OrderBuyType = "云改直";
|
||||
OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
|
||||
}
|
||||
else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
|
||||
else if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
|
||||
{
|
||||
OrderBuyType = "直发";
|
||||
OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
|
||||
}
|
||||
else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
|
||||
else if (this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
|
||||
{
|
||||
OrderBuyType = "云仓";
|
||||
OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
|
||||
@@ -773,11 +773,11 @@ namespace AllBase.Model.DBModel
|
||||
else
|
||||
OrderBuyType = "";
|
||||
|
||||
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
|
||||
if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
|
||||
this.RefundTypeStr = "仅退款";
|
||||
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
|
||||
else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
|
||||
this.RefundTypeStr = "退货退款";
|
||||
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
|
||||
else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
|
||||
this.RefundTypeStr = "仅退款/退货退款";
|
||||
|
||||
IsWaitBuy = GetIsWaitBuy();
|
||||
@@ -795,7 +795,7 @@ namespace AllBase.Model.DBModel
|
||||
else
|
||||
IsShowChangeWaybillBtn = true;
|
||||
|
||||
if (IsWaitBuy || this.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
|
||||
if (IsWaitBuy || this.OrderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
|
||||
IsShowTransitExtraPackagesBtn = false;
|
||||
else
|
||||
IsShowTransitExtraPackagesBtn = true;
|
||||
@@ -807,12 +807,12 @@ namespace AllBase.Model.DBModel
|
||||
SetShipDoneTimeStr();
|
||||
SetColorBrush();
|
||||
|
||||
orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : "";
|
||||
OrderItem = OrderItems.FirstOrDefault() != null ? OrderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
OrderItem2 = OrderItems.Count > 1 ? OrderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
OrderItem3 = OrderItems.Count > 2 ? OrderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
OrderItem4 = OrderItems.Count > 3 ? OrderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
OrderItem5 = OrderItems.Count > 4 ? OrderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
|
||||
OrderDiffItemCountStr = OrderItems.Count > 1 ? "该订单共有 " + OrderItems.Count + " 个不同的商品规格" : "";
|
||||
}
|
||||
|
||||
public void SetColorBrush()
|
||||
@@ -835,13 +835,13 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
if (status != 20 && status != 21)
|
||||
return false;
|
||||
if (refundItems?.Any(r => r.IsRefund) == true)
|
||||
if (RefundItems?.Any(r => r.IsRefund) == true)
|
||||
return false;
|
||||
// 子表有售后信息(可能更新不及时)
|
||||
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
return false;
|
||||
// 中转仓有拍单信息
|
||||
if (orderItems.All(oi => oi.ItemTransitOrder != null))
|
||||
if (OrderItems.All(oi => oi.ItemTransitOrder != null))
|
||||
return false;
|
||||
// 采购状态为已采购
|
||||
if (purchase_status != 0)
|
||||
@@ -865,16 +865,16 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
if (status != 20 && status != 21)
|
||||
return false;
|
||||
if (refundItems?.Any(r => r.IsRefund) == true)
|
||||
if (RefundItems?.Any(r => r.IsRefund) == true)
|
||||
return false;
|
||||
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
return false;
|
||||
// 礼物单已发货
|
||||
if (gift_order_status == 1 || gift_order_status == 2)
|
||||
return false;
|
||||
// 店铺未发货,外采已采购
|
||||
// out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉
|
||||
if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
|
||||
if (!OrderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
|
||||
(string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
|
||||
return false;
|
||||
return true;
|
||||
@@ -882,9 +882,9 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
private bool GetIsWaitReceive()
|
||||
{
|
||||
if (refundItems?.Any(r => r.IsRefund) == true)
|
||||
if (RefundItems?.Any(r => r.IsRefund) == true)
|
||||
return false;
|
||||
if (orderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
|
||||
return false;
|
||||
if (!(status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2))
|
||||
return false;
|
||||
@@ -903,23 +903,23 @@ namespace AllBase.Model.DBModel
|
||||
return false;
|
||||
|
||||
// 如果有售后,直接作为售后单处理
|
||||
if (orderItems.All(oi => oi.refund_status > 1))
|
||||
if (OrderItems.All(oi => oi.refund_status > 1))
|
||||
return false;
|
||||
// 直发或者云改直已购买且未退货,从异常单移除
|
||||
if (orderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
|
||||
if (OrderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
|
||||
return false;
|
||||
if (gift_order_status == 1 || gift_order_status == 2)
|
||||
return false;
|
||||
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
|
||||
if (OrderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
|
||||
return true;
|
||||
|
||||
// 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功
|
||||
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
|
||||
if (OrderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
|
||||
return true;
|
||||
|
||||
// 取号异常或无法调用发货也放在异常单(异常需重拍)
|
||||
// 订单不满足鸿浩仓库发货条件,无法调用鸿浩仓库接口发货
|
||||
else if (orderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
|
||||
else if (OrderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
|
||||
(oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
|
||||
oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
|
||||
return true;
|
||||
@@ -929,7 +929,7 @@ namespace AllBase.Model.DBModel
|
||||
public bool GetIsRefund()
|
||||
{
|
||||
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
|
||||
if (!orderItems.Any(oi => oi.refund_status > 1))
|
||||
if (!OrderItems.Any(oi => oi.refund_status > 1))
|
||||
return false;
|
||||
if (GetIsEmergency())
|
||||
return false;
|
||||
@@ -939,16 +939,16 @@ namespace AllBase.Model.DBModel
|
||||
public bool GetIsEmergency()
|
||||
{
|
||||
// 微信订单退货中
|
||||
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
|
||||
if (OrderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
// 微信订单退款中或退款成功,但是买手订单未完成退款
|
||||
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
|
||||
if (OrderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
|
||||
if (OrderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -959,7 +959,7 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
|
||||
return this.OrderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -306,10 +306,10 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
|
||||
}
|
||||
if (ItemOrder?.refundItems?.Count == 1)
|
||||
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
|
||||
if (ItemOrder?.RefundItems?.Count == 1)
|
||||
ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault();
|
||||
else
|
||||
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
|
||||
ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
|
||||
|
||||
if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
|
||||
this.RefundResultStr = "";
|
||||
@@ -1328,7 +1328,7 @@ namespace AllBase.Model.DBModel
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
CashCouponDiscountedPriceStr = "¥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.orderItems.Count).ParseToDecimal().ToString("0.00");
|
||||
PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.OrderItems.Count).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
PurchasePriceStr = "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
@@ -1361,8 +1361,8 @@ namespace AllBase.Model.DBModel
|
||||
OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
|
||||
|
||||
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
|
||||
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count;
|
||||
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.orderItems.Count;
|
||||
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.OrderItems.Count;
|
||||
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.OrderItems.Count;
|
||||
ProfitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price - purchase_price.ParseToInt() - freight.ParseToInt() -
|
||||
predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
|
||||
|
||||
@@ -1845,13 +1845,13 @@ namespace AllBase.Model.DBModel
|
||||
/// <summary> 初始化物流明细信息 </summary>
|
||||
public void SetEWaybillInfo()
|
||||
{
|
||||
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
|
||||
LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
|
||||
if (this.ItemOrder?.LatestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
|
||||
LatestTransitEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
|
||||
else
|
||||
LatestTransitEWaybill = null;
|
||||
|
||||
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no))
|
||||
LatestDirectEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
|
||||
if (this.ItemOrder?.LatestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no))
|
||||
LatestDirectEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
|
||||
else
|
||||
LatestDirectEWaybill = null;
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ public sealed class TicketOrderOption
|
||||
|
||||
var goodsName = string.Join(
|
||||
"、",
|
||||
(order.orderItems ?? Enumerable.Empty<oms_wei_order_item_info>())
|
||||
(order.OrderItems ?? Enumerable.Empty<oms_wei_order_item_info>())
|
||||
.Select(item => item.title)
|
||||
.Where(title => !string.IsNullOrWhiteSpace(title))
|
||||
.Distinct());
|
||||
@@ -166,7 +166,7 @@ public sealed class TicketOrderOption
|
||||
AppId = appId?.Trim(),
|
||||
OrderId = order.order_id,
|
||||
GoodsName = goodsName,
|
||||
ImageUrl = (order.orderItems ?? Enumerable.Empty<oms_wei_order_item_info>())
|
||||
ImageUrl = (order.OrderItems ?? Enumerable.Empty<oms_wei_order_item_info>())
|
||||
.Select(item => item.thumb_img)
|
||||
.FirstOrDefault(url => !string.IsNullOrWhiteSpace(url)),
|
||||
Amount = (order.order_price ?? 0) / 100m,
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace Work.ERP.API.Orders
|
||||
{
|
||||
public class ShipGiftServiceApi
|
||||
{
|
||||
public async Task<bool> SendShipGift(string[] orderIds, int giftType, decimal amount, decimal oemGiftAmount)
|
||||
public async Task<bool> SendShipGift(string[] orderIds, int giftType, decimal amount, decimal oemGiftAmount, decimal parentOemGiftAmount, string oemId, string parentOemId)
|
||||
{
|
||||
string data = JsonConvert.SerializeObject(new
|
||||
{
|
||||
@@ -25,7 +25,10 @@ namespace Work.ERP.API.Orders
|
||||
userName = BaseClass.UserName,
|
||||
giftOrderType = (int)giftType,
|
||||
amount = (int)(amount * 100),
|
||||
oemAmount = (int)(oemGiftAmount * 100)
|
||||
oemAmount = (int)(oemGiftAmount * 100),
|
||||
parentOemAmount = (int)(parentOemGiftAmount * 100),
|
||||
oemId = oemId,
|
||||
parentOemId = parentOemId
|
||||
});
|
||||
Debug.WriteLine($"礼品单:{data}");
|
||||
var result = await ERPHttp.e57PostResponseAsync<Result>("/prod-api/api/oms-api/gift/order/deliveryFor29Erp", data);
|
||||
|
||||
@@ -151,8 +151,11 @@ namespace Work
|
||||
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
|
||||
BaseClass.RechargeAmountTotal = BaseRegex.GetDecimalJson(ref html, "recharge_amount_total");
|
||||
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
|
||||
BaseClass.ParentOemGiftAmount = BaseRegex.GetDecimalJson(ref html, "parent_gift_oem_amount_per_order");
|
||||
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
||||
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
||||
BaseClass.ParentOemId = BaseRegex.GetStringJson(ref html, "parent_oem_id");
|
||||
BaseClass.ParentOemName = BaseRegex.GetStringJson(ref html, "parent_oem_name");
|
||||
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
|
||||
#if DEBUG
|
||||
if (!string.IsNullOrEmpty(BaseRegex.GetStringJson(ref html, "order_api_url")) && !BaseClass.LoginApiUrl.Contains("localhost") && !BaseClass.LoginApiUrl.Contains("127.0.0.1"))
|
||||
|
||||
@@ -218,7 +218,7 @@ namespace Work._29Tools.BLL
|
||||
sb.Append("&order_id=").Append(order.order_id);
|
||||
sb.Append("&ds_order_id=").Append(dropShopOrderId);
|
||||
sb.Append("&dropship_product_list=").Append("[");
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
sb.Append("{\"spu_id\":\"").Append(item.product_id).Append("\",\"sku_id\":\"").Append(item.sku_id).Append("\",\"product_cnt\":").Append(item.sku_cnt).Append("},");
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ namespace TemuKJD.ToolForms
|
||||
this.txtShopGoodsName.Text = orderItem.title;
|
||||
this.txtShopSpecName.Text = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPrice.Text = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
this.txtShopOrderItemPrice.Text = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString();
|
||||
|
||||
this.txtOrderId.Text = orderItem.order_id;
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
@@ -608,7 +608,7 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
if (IsAutoBuy && GlobalConfig.AutoBuyConfig.IsLimitMinProfit)
|
||||
{
|
||||
var salePrice = orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count;
|
||||
var salePrice = orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count;
|
||||
var profit = salePrice - buyPrice * 0.01m;
|
||||
var limitProfit = GlobalConfig.AutoBuyConfig.MinProfit * 0.01m;
|
||||
if (profit < limitProfit)
|
||||
@@ -1323,7 +1323,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
|
||||
{
|
||||
@@ -1388,7 +1388,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if ((item.out_product_id == pddBuyMap.spu_code && item.out_sku_id == pddBuyMap.sku_code) ||
|
||||
(item.out_product_id == pddBuyMap.spu_code && item.SkuAttrStr == pddBuyMap.sku_code) ||
|
||||
@@ -1515,8 +1515,11 @@ namespace TemuKJD.ToolForms
|
||||
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
|
||||
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
body["parentOemId"] = BaseClass.ParentOemId;
|
||||
body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["oemId"] = BaseClass.OemId;
|
||||
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
}
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
|
||||
Reference in new issue
Block a user