订单仓库状态优化,调整文件位置
This commit is contained in:
1 parent
ed3545e376
commit
d6f81f9ef4
47 files changed
+251
-84
No files matched your search
@@ -3,7 +3,7 @@ using _29WxOrderWpf.CefHelper;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model;
|
||||
using AllBase.Model.Local;
|
||||
using AllBase.Model.DBModel;
|
||||
using AllBase.Model.Result;
|
||||
using CefSharp;
|
||||
using CefSharp.DevTools.LayerTree;
|
||||
@@ -431,7 +431,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
/// 读取中转仓拍单订单
|
||||
/// </summary>
|
||||
/// <param name="out_order_nos"></param>
|
||||
List<oms_wei_external_procurement_log> GetOrderTransitWarehouseInfo(string out_order_nos)
|
||||
List<oms_wei_external_procurement_log_info> GetOrderTransitWarehouseInfo(string out_order_nos)
|
||||
{
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
@@ -447,10 +447,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
//}));
|
||||
//break;
|
||||
}
|
||||
List<oms_wei_external_procurement_log> transitOrderList = new List<oms_wei_external_procurement_log>();
|
||||
List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
|
||||
try
|
||||
{
|
||||
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString());
|
||||
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
|
||||
// 直接过滤掉仓库作废单
|
||||
//transitOrderList = transitOrderList.Where(t => t.order_void_status != 1).ToList();
|
||||
}
|
||||
@@ -557,7 +557,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
return refunds;
|
||||
}
|
||||
|
||||
void UpdateOrderStatus(PddBuyerOrderLiteInfo pdd_order, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log wx_transit_order)
|
||||
void UpdateOrderStatus(PddBuyerOrderLiteInfo pdd_order, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log_info wx_transit_order)
|
||||
{
|
||||
pdd_order.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
|
||||
pdd_order.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
|
||||
@@ -586,10 +586,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
pdd_order.sendStatus += " 已作废";
|
||||
}
|
||||
pdd_order.TransitCreateTime = wx_transit_order?.created_time ?? DateTime.MinValue;
|
||||
pdd_order.TransitPickupTime = wx_transit_order?.pickup_time ?? DateTime.MaxValue.AddMonths(-1);
|
||||
}
|
||||
|
||||
|
||||
void UpdateAfterSaleStatus(PddBuyerAfterSaleLiteInfo pdd_afterSale, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log wx_transit_order)
|
||||
void UpdateAfterSaleStatus(PddBuyerAfterSaleLiteInfo pdd_afterSale, oms_wei_order_item_info wx_order_item, oms_wei_refund_info wx_refund_item, oms_wei_external_procurement_log_info wx_transit_order)
|
||||
{
|
||||
pdd_afterSale.ShopOrderIdStr = wx_order_item?.order_id ?? wx_transit_order?.order_no;
|
||||
pdd_afterSale.ShopOrderSkuIdStr = wx_order_item?.sku_id ?? wx_transit_order?.order_sku_id;
|
||||
@@ -614,6 +615,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 更新订单中转取号状态
|
||||
pdd_afterSale.sendStatus = (pdd_afterSale.TransitOrderStatus + " " + pdd_afterSale.ShopOrderRefundStr).Trim();
|
||||
pdd_afterSale.TransitCreateTime = wx_transit_order?.created_time ?? DateTime.MinValue;
|
||||
pdd_afterSale.TransitPickupTime = wx_transit_order?.pickup_time ?? DateTime.MaxValue.AddMonths(-1);
|
||||
}
|
||||
|
||||
|
||||
@@ -740,10 +742,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order.tracking_number = o.tracking_number;
|
||||
|
||||
order.TransitCreateTime = o.TransitCreateTime;
|
||||
if (o.TransitCreateTime > DateTime.MinValue)
|
||||
{
|
||||
order.TransitPickupTime = o.TransitPickupTime;
|
||||
|
||||
}
|
||||
order.WxOrderCreateTime = o.WxOrderCreateTime;
|
||||
order.ShopOrderIdStr = o.ShopOrderIdStr;
|
||||
order.ShopOrderSkuIdStr = o.ShopOrderSkuIdStr;
|
||||
@@ -837,6 +837,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
pre_allocated_order_no = order.PreAllocatedOrderNoStr.ParseToInt(),
|
||||
tracking_number = order.tracking_number,
|
||||
TransitCreateTime = order.TransitCreateTime,
|
||||
TransitPickupTime = order.TransitPickupTime,
|
||||
wx_order_id = order.ShopOrderIdStr,
|
||||
wx_sku_id = order.ShopOrderSkuIdStr,
|
||||
};
|
||||
@@ -853,6 +854,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
data3 += "&pre_allocated_order_no=" + pddBuyerOrder.pre_allocated_order_no;
|
||||
data3 += "&tracking_number=" + pddBuyerOrder.tracking_number;
|
||||
data3 += "&TransitCreateTime=" + pddBuyerOrder.TransitCreateTime.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&TransitPickupTime=" + pddBuyerOrder.TransitPickupTime.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&wx_order_id=" + pddBuyerOrder.wx_order_id;
|
||||
data3 += "&wx_sku_id=" + pddBuyerOrder.wx_sku_id;
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
@@ -964,6 +966,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
afterSale.listItemStatusVO = JsonHelper.DeserializeJsonToObject<ListItemStatusVO>(JsonHelper.SerializeObject(af.listItemStatusVO));
|
||||
|
||||
afterSale.TransitCreateTime = af.TransitCreateTime;
|
||||
afterSale.TransitPickupTime = af.TransitPickupTime;
|
||||
afterSale.WxOrderCreateTime = af.WxOrderCreateTime;
|
||||
afterSale.ShopOrderIdStr = af.ShopOrderIdStr;
|
||||
afterSale.ShopOrderSkuIdStr = af.ShopOrderSkuIdStr;
|
||||
@@ -1573,7 +1576,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 修改提前取号
|
||||
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
|
||||
{
|
||||
if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
|
||||
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
|
||||
{
|
||||
order.sendStatus = "提前取号流程进行中";
|
||||
return;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Local;
|
||||
using AllBase.Model.DBModel;
|
||||
using AllBase.Model.Result;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
Reference in new issue
Block a user