优化读单
This commit is contained in:
1 parent
171064f03f
commit
5e453e2927
10 files changed
+566
-402
No files matched your search
@@ -12,15 +12,257 @@ using System.Security.Policy;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Documents;
|
using System.Windows.Documents;
|
||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
using Work;
|
using Work;
|
||||||
|
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
|
||||||
|
|
||||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||||
|
|
||||||
public class OrderGetOrderListHelper
|
public class OrderGetOrderListHelper
|
||||||
{
|
{
|
||||||
|
public static async Task GetWxOrderAsync(bool showReadOrderMsg = true, string orderIds = "")
|
||||||
|
{
|
||||||
|
bool hasGetPage = false;
|
||||||
|
int page = 0;
|
||||||
|
int totalPage = 1;
|
||||||
|
int pageSize = 50;
|
||||||
|
#if DEBUG
|
||||||
|
pageSize = 200;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (page >= totalPage)
|
||||||
|
break;
|
||||||
|
page++;
|
||||||
|
|
||||||
|
if (showReadOrderMsg)
|
||||||
|
MainWindow.Instance.orderListCtrl.BottomMsg = "当前正在读取订单...,第" + page + "页" + (hasGetPage == false ? "" : ("/共" + totalPage + "页"));
|
||||||
|
|
||||||
|
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
||||||
|
var data = UserLogin.GetSignaturex() + "&page=" + page;
|
||||||
|
if (!string.IsNullOrEmpty(orderIds))
|
||||||
|
data += "&erp_order_id_in=" + orderIds;
|
||||||
|
if (page > 1)
|
||||||
|
data += "&is_not_count=true";
|
||||||
|
data += "&page_size=" + pageSize;
|
||||||
|
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||||
|
//指定订单id的查询,不再查询店铺id
|
||||||
|
if (string.IsNullOrEmpty(orderIds))
|
||||||
|
data += "&erp_shop_id_in=" + shop_id;
|
||||||
|
|
||||||
|
// 按过滤条件读取 已废弃
|
||||||
|
//if (filterGetCondition)
|
||||||
|
//{
|
||||||
|
// if (!string.IsNullOrEmpty(orderFilterConfig.txtFilterShopNameText))
|
||||||
|
// {
|
||||||
|
// var shopNames = orderFilterConfig.txtFilterShopNameText.Split(';').Where(s => !s.IsNullOrEmpty()).ToList();
|
||||||
|
// shop_id = string.Join(",", GlobalConfig.ShopLoginList.Where(s => shopNames.Contains(s.ShopAccount)).Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
var startTime = BaseClass.DateTimeToTimestampSeconds(MainWindow.Instance.orderListCtrl.DateStart);
|
||||||
|
var endTime = BaseClass.DateTimeToTimestampSeconds(MainWindow.Instance.orderListCtrl.DateEnd.AddDays(1));
|
||||||
|
if (!MainWindow.Instance.orderListCtrl.IsEndDate)
|
||||||
|
endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(1));
|
||||||
|
// 查询单一订单号订单,不按时间范围搜索
|
||||||
|
if (string.IsNullOrEmpty(orderIds) || orderIds.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList().Count != 1)
|
||||||
|
{
|
||||||
|
data += "&start_time=" + startTime;
|
||||||
|
data += "&end_time=" + endTime;
|
||||||
|
}
|
||||||
|
await Task.Delay(200);
|
||||||
|
|
||||||
|
var html = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
||||||
|
if (totalCount > 0)
|
||||||
|
{
|
||||||
|
hasGetPage = true;
|
||||||
|
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
var seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
||||||
|
|
||||||
|
var jArr = JObject.Parse(html)["data"];
|
||||||
|
if (jArr.Count() == 0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
var order_ids = string.Join(",", jArr.Select(a => a["order_id"].ParseToString()));
|
||||||
|
|
||||||
|
// 读取订单详情
|
||||||
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
|
await Task.Delay(100);
|
||||||
|
List<oms_wei_order_item_info> orderItems = await OrderGetOrderListHelper.GetOrderItemInfo(order_ids);
|
||||||
|
|
||||||
|
// 读取售后单
|
||||||
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
|
await Task.Delay(100);
|
||||||
|
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
|
||||||
|
|
||||||
|
// 读订单扩展
|
||||||
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
|
await Task.Delay(100);
|
||||||
|
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
|
||||||
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
|
{
|
||||||
|
foreach (var oie in orderItemExts)
|
||||||
|
{
|
||||||
|
// 移除订单物流异常信息,每次批量读单最后要去微信获取
|
||||||
|
// 改为后台模拟读取不存在则设置为 ""
|
||||||
|
//oie.abnormal_text = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读取中转仓拍单订单
|
||||||
|
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 buyMapList = await OrderGetOrderListHelper.GetBuyProdMap(orderItems);
|
||||||
|
|
||||||
|
// 读取关联拍单的所有sku
|
||||||
|
var buyMapSkusList = await OrderGetOrderListHelper.GetBuyProdMapSkus(orderItems);
|
||||||
|
|
||||||
|
// 读取物流轨迹
|
||||||
|
var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids);
|
||||||
|
|
||||||
|
var orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JsonHelper.SerializeObject(jArr));
|
||||||
|
// 装载订单
|
||||||
|
foreach (var order in orders)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
//装载订单商品详情
|
||||||
|
order.OrderItems = new ObservableCollection<oms_wei_order_item_info>();
|
||||||
|
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
||||||
|
{
|
||||||
|
// 订单商品
|
||||||
|
item.ItemOrder = order;
|
||||||
|
order.OrderItems.Add(item);
|
||||||
|
|
||||||
|
item.OrderItemExt = orderItemExts.FirstOrDefault(ext => ext.order_id == item.order_id && item.sku_id == item.sku_id);
|
||||||
|
|
||||||
|
// 已放到赋值函数中处理
|
||||||
|
// 更新店铺是否加入代发情况
|
||||||
|
//item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == item.order_id);
|
||||||
|
//Dispatcher.Invoke(new Action(() => { item.UpdateOrderItemBuyButton(); }));
|
||||||
|
|
||||||
|
// 关联拍单关系 // 危险物品禁止拍单,仅关联安全商品
|
||||||
|
//if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
||||||
|
{
|
||||||
|
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
|
||||||
|
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||||
|
if (item.PddBuyMap == null)
|
||||||
|
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||||
|
if (item.PddBuyMap == null)
|
||||||
|
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||||
|
if (item.PddBuyMap == null)
|
||||||
|
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||||
|
}
|
||||||
|
item.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();
|
||||||
|
|
||||||
|
{
|
||||||
|
var tbBuyMapLst = buyMapList.Where(m => m.platform == "tb").ToList();
|
||||||
|
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
||||||
|
if (item.TbBuyMap == null)
|
||||||
|
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
||||||
|
if (item.TbBuyMap == null)
|
||||||
|
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
||||||
|
if (item.TbBuyMap == null)
|
||||||
|
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
||||||
|
}
|
||||||
|
item.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 (item.ItemOrder.OrderItems.Count > 1)
|
||||||
|
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
||||||
|
else
|
||||||
|
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
||||||
|
item.ItemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code || t.order_code == a.order_code)).ToList();
|
||||||
|
item.DistribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();
|
||||||
|
item.ItemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList();
|
||||||
|
|
||||||
|
// 中转仓买手订单(wx_send_type等于0)
|
||||||
|
item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||||
|
// 中转仓买手退货订单(wx_send_type等于0)
|
||||||
|
item.PddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
||||||
|
// 直发买手订单(wx_send_type等于1)
|
||||||
|
item.DirectPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).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 MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (page % 5 == 1)
|
||||||
|
await MainWindow.Instance.orderListCtrl.disPlayOrderTabOrderCountAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 增量读取全部订单信息
|
/// 增量读取全部订单信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -34,17 +276,22 @@ public class OrderGetOrderListHelper
|
|||||||
var shopIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
var shopIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||||
var shopIds = string.Join(",", shopIdList);
|
var shopIds = string.Join(",", shopIdList);
|
||||||
|
|
||||||
int pageCount = 1;
|
int totalPage = 1;
|
||||||
List<oms_wei_order_info> upadtaOrderList = new List<oms_wei_order_info>();
|
List<oms_wei_order_info> upadtaOrderList = new List<oms_wei_order_info>();
|
||||||
var beginDatetime = lastUpdateTime;
|
var beginDatetime = lastUpdateTime;
|
||||||
var endDateTime = DateTime.Now;
|
var endDateTime = DateTime.Now;
|
||||||
lastUpdateTime = endDateTime.AddSeconds(-30);
|
int page = 0;
|
||||||
for (int page = 1; page <= pageCount; page++)
|
for (page = 1; page <= totalPage; page++)
|
||||||
{
|
{
|
||||||
|
if (MainWindow.Instance.orderListCtrl.IsAutoReadOrder != true)
|
||||||
|
break;
|
||||||
|
|
||||||
|
MainWindow.Instance.orderListCtrl.BottomMsg = "当前正在增量读取店铺订单...,第" + page + "页" + (page == 1 ? "" : ("/共" + totalPage + "页"));
|
||||||
|
|
||||||
var erpOrderInfo = await GetOrderInfoBase(null, shopIds, beginDatetime, endDateTime, page, 100, page == 1);
|
var erpOrderInfo = await GetOrderInfoBase(null, shopIds, beginDatetime, endDateTime, page, 100, page == 1);
|
||||||
|
|
||||||
if (page == 1)
|
if (page == 1)
|
||||||
pageCount = erpOrderInfo.PageCount;
|
totalPage = erpOrderInfo.PageCount;
|
||||||
|
|
||||||
// 遇到相同订单就更新状态,否则就新增一条数据
|
// 遇到相同订单就更新状态,否则就新增一条数据
|
||||||
foreach (var order in erpOrderInfo.OrderList)
|
foreach (var order in erpOrderInfo.OrderList)
|
||||||
@@ -178,9 +425,19 @@ public class OrderGetOrderListHelper
|
|||||||
//orderIdList.AddRange(updateOrderIdList);
|
//orderIdList.AddRange(updateOrderIdList);
|
||||||
var orderIdList = GlobalConfig.lstOrder.ToList().Select(o => o.order_id).Distinct().ToList();
|
var orderIdList = GlobalConfig.lstOrder.ToList().Select(o => o.order_id).Distinct().ToList();
|
||||||
|
|
||||||
while(orderIdList.Count > 0 )
|
page = 0;
|
||||||
|
totalPage = 1;
|
||||||
|
int pageSize = 200;
|
||||||
|
while(orderIdList.Count > 0)
|
||||||
{
|
{
|
||||||
var orderIdTake = orderIdList.Take(200).ToList();
|
if (MainWindow.Instance.orderListCtrl.IsAutoReadOrder != true)
|
||||||
|
break;
|
||||||
|
|
||||||
|
page++;
|
||||||
|
if (page == 1)
|
||||||
|
totalPage = Math.Ceiling(orderIdList.Count * 1m / pageSize).ParseToInt();
|
||||||
|
MainWindow.Instance.orderListCtrl.BottomMsg = "当前正在增量读取店铺订单拍单信息...,第" + page + "页" + (page == 1 ? "" : ("/共" + totalPage + "页"));
|
||||||
|
var orderIdTake = orderIdList.Take(pageSize).ToList();
|
||||||
orderIdList.RemoveAll(o => orderIdTake.Contains(o));
|
orderIdList.RemoveAll(o => orderIdTake.Contains(o));
|
||||||
|
|
||||||
var order_ids = string.Join(",", orderIdTake);
|
var order_ids = string.Join(",", orderIdTake);
|
||||||
@@ -189,10 +446,10 @@ public class OrderGetOrderListHelper
|
|||||||
await Task.Delay(200);
|
await Task.Delay(200);
|
||||||
|
|
||||||
// 读取售后单
|
// 读取售后单
|
||||||
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
|
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids, beginDatetime);
|
||||||
|
|
||||||
// 读订单扩展
|
// 读订单扩展
|
||||||
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
|
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids, beginDatetime);
|
||||||
|
|
||||||
// 读取中转仓拍单订单
|
// 读取中转仓拍单订单
|
||||||
var transitOrderList = await OrderGetOrderListHelper.GetTransitWarehouseList(order_ids);
|
var transitOrderList = await OrderGetOrderListHelper.GetTransitWarehouseList(order_ids);
|
||||||
@@ -207,14 +464,14 @@ public class OrderGetOrderListHelper
|
|||||||
var transitReturnOrderList = await OrderGetOrderListHelper.GetTransitReturnOrderList(order_ids);
|
var transitReturnOrderList = await OrderGetOrderListHelper.GetTransitReturnOrderList(order_ids);
|
||||||
|
|
||||||
// 读取暂时记录的买手订单,后面想办法放到中转订单库里去
|
// 读取暂时记录的买手订单,后面想办法放到中转订单库里去
|
||||||
var pddBuyerOrders = await OrderGetOrderListHelper.GetPddBuyerOrders(order_ids);
|
var pddBuyerOrders = await OrderGetOrderListHelper.GetPddBuyerOrders(order_ids, beginDatetime);
|
||||||
// 读取暂时记录的淘宝买手订单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
// 读取暂时记录的淘宝买手订单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
||||||
pddBuyerOrders.AddRange(await OrderGetOrderListHelper.GetTbBuyerOrders(order_ids));
|
pddBuyerOrders.AddRange(await OrderGetOrderListHelper.GetTbBuyerOrders(order_ids, beginDatetime));
|
||||||
|
|
||||||
// 读取暂时记录的买手售后单,后面想办法放到中转订单库里去
|
// 读取暂时记录的买手售后单,后面想办法放到中转订单库里去
|
||||||
var pddBuyerAfterSales = await OrderGetOrderListHelper.GetPddBuyerAfterSales(order_ids);
|
var pddBuyerAfterSales = await OrderGetOrderListHelper.GetPddBuyerAfterSales(order_ids, beginDatetime);
|
||||||
// 读取暂时记录的淘宝买手售后单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
// 读取暂时记录的淘宝买手售后单(格式与拼多多的一致,存在不同的表中),后面想办法放到中转订单库里去
|
||||||
pddBuyerAfterSales.AddRange(await OrderGetOrderListHelper.GetTbBuyerAfterSales(order_ids));
|
pddBuyerAfterSales.AddRange(await OrderGetOrderListHelper.GetTbBuyerAfterSales(order_ids, beginDatetime));
|
||||||
|
|
||||||
// 同步单
|
// 同步单
|
||||||
var buyerOrderIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
var buyerOrderIds = string.Join(",", pddBuyerOrders.Select(o => o.order_sn));
|
||||||
@@ -310,8 +567,8 @@ public class OrderGetOrderListHelper
|
|||||||
var itemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code || t.order_code == a.order_code)).ToList();
|
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)
|
if (itemTransitOrderAfterSales.Count > 0)
|
||||||
{
|
{
|
||||||
transitAfterSaleList.AddRange(item.ItemTransitOrderAfterSales.ToList().Where(iaf => !itemTransitOrderAfterSales.Any(af => af.order_code == iaf.order_code)));
|
itemTransitOrderAfterSales.AddRange(item.ItemTransitOrderAfterSales.ToList().Where(iaf => !itemTransitOrderAfterSales.Any(af => af.order_code == iaf.order_code)));
|
||||||
item.ItemTransitOrderAfterSales = transitAfterSaleList.OrderByDescending(iaf => iaf.id).ToList();
|
item.ItemTransitOrderAfterSales = itemTransitOrderAfterSales.OrderByDescending(iaf => iaf.id).ToList();
|
||||||
}
|
}
|
||||||
// 中转仓额外单
|
// 中转仓额外单
|
||||||
if (item.ItemTransitExtraOrders == null)
|
if (item.ItemTransitExtraOrders == null)
|
||||||
@@ -361,17 +618,45 @@ public class OrderGetOrderListHelper
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 直发买手退款订单(wx_send_type等于1)
|
// 直发买手退款订单(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();
|
if (item.DirectPddBuyerAfterSales == null)
|
||||||
|
item.DirectPddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||||
|
var directPddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).ToList();
|
||||||
|
if (transitPddBuyerAfterSales.Count > 0)
|
||||||
|
{
|
||||||
|
directPddBuyerAfterSales.AddRange(item.DirectPddBuyerAfterSales.ToList().Where(iaf => !directPddBuyerAfterSales.Any(af => af.orderSn == iaf.orderSn)));
|
||||||
|
item.DirectPddBuyerAfterSales = directPddBuyerAfterSales.OrderByDescending(iaf => iaf.id).ToList();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 装载订单售后详情
|
// 装载订单售后详情
|
||||||
order.RefundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
if (order.RefundItems == null)
|
||||||
|
order.RefundItems = new ObservableCollection<oms_wei_refund_info>();
|
||||||
|
List<oms_wei_refund_info> refundItems = refunds.Where(of => of.order_id == order.order_id).ToList();
|
||||||
|
if (refundItems.Count > 0)
|
||||||
|
{
|
||||||
|
refundItems.AddRange(order.RefundItems.ToList().Where(or => !refundItems.Any(r => r.after_sale_order_id == or.after_sale_order_id)));
|
||||||
|
order.RefundItems = new ObservableCollection<oms_wei_refund_info>(refundItems);
|
||||||
|
}
|
||||||
|
|
||||||
// 装载同步单
|
// 装载同步单
|
||||||
order.SyncLogisticsList = [.. syncLogistics.Where(os => order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))),];
|
if (order.SyncLogisticsList == null)
|
||||||
|
order.SyncLogisticsList = new NaiBa.Util.ConcurrentList<yh_sync_logistics>();
|
||||||
|
var _syncLogistics = syncLogistics.Where(os => order.OrderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))).ToList();
|
||||||
|
if (_syncLogistics.Count > 0)
|
||||||
|
{
|
||||||
|
_syncLogistics.AddRange(order.SyncLogisticsList.ToList().Where(osl => !_syncLogistics.Any(sl => sl.id == osl.id)));
|
||||||
|
order.SyncLogisticsList = [.. _syncLogistics,];
|
||||||
|
}
|
||||||
|
|
||||||
// 装载订单物流最后一条信息
|
// 装载订单物流最后一条信息
|
||||||
order.LatestEWaybills = [.. ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong())];
|
if (order.LatestEWaybills == null)
|
||||||
|
order.LatestEWaybills = new NaiBa.Util.ConcurrentList<oms_wei_ewaybill_path>();
|
||||||
|
var _latestEWaybills = ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong()).ToList();
|
||||||
|
if (_latestEWaybills.Count > 0)
|
||||||
|
{
|
||||||
|
_latestEWaybills.AddRange(order.LatestEWaybills.ToList().Where(oew => !_latestEWaybills.Any(ew => ew.id == oew.id)));
|
||||||
|
order.LatestEWaybills = [.. _latestEWaybills, ];
|
||||||
|
}
|
||||||
|
|
||||||
// 读取订单后立即赋值,防止滚动时实时赋值造成卡顿
|
// 读取订单后立即赋值,防止滚动时实时赋值造成卡顿
|
||||||
OrderListCtrl.InitOrderObservableProp(order);
|
OrderListCtrl.InitOrderObservableProp(order);
|
||||||
@@ -390,6 +675,9 @@ public class OrderGetOrderListHelper
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (page % 5 == 1)
|
||||||
|
await MainWindow.Instance.orderListCtrl.disPlayOrderTabOrderCountAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -460,7 +748,7 @@ public class OrderGetOrderListHelper
|
|||||||
|
|
||||||
if (updateTabCount)
|
if (updateTabCount)
|
||||||
{
|
{
|
||||||
await MainWindow.Instance.orderListCtrl.disPlayOrderTabOrderCount();
|
await MainWindow.Instance.orderListCtrl.disPlayOrderTabOrderCountAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -592,7 +880,7 @@ public class OrderGetOrderListHelper
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="order_ids"></param>
|
/// <param name="order_ids"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids)
|
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids, DateTime? start_time = null, DateTime? end_time = null)
|
||||||
{
|
{
|
||||||
Thread.Sleep(100);
|
Thread.Sleep(100);
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
@@ -600,6 +888,10 @@ public class OrderGetOrderListHelper
|
|||||||
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
|
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
|
||||||
var data2 = UserLogin.GetSignaturex();
|
var data2 = UserLogin.GetSignaturex();
|
||||||
data2 += "&erp_order_id_in=" + order_ids;
|
data2 += "&erp_order_id_in=" + order_ids;
|
||||||
|
if (start_time != null)
|
||||||
|
data2 += "&start_time=" + BaseClass.DateTimeToTimestampSeconds(start_time.Value);
|
||||||
|
if (end_time != null)
|
||||||
|
data2 += "&end_time=" + BaseClass.DateTimeToTimestampSeconds(end_time.Value);
|
||||||
var html2 = await GetHtml.PostUtf8Async(url2, data2);
|
var html2 = await GetHtml.PostUtf8Async(url2, data2);
|
||||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||||
html2 = await GetHtml.PostUtf8Async(url2, data2);
|
html2 = await GetHtml.PostUtf8Async(url2, data2);
|
||||||
@@ -618,7 +910,7 @@ public class OrderGetOrderListHelper
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="order_ids"></param>
|
/// <param name="order_ids"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids)
|
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids, DateTime? start_time = null, DateTime? end_time = null)
|
||||||
{
|
{
|
||||||
Thread.Sleep(100);
|
Thread.Sleep(100);
|
||||||
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
|
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
|
||||||
@@ -627,6 +919,10 @@ public class OrderGetOrderListHelper
|
|||||||
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
|
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
|
||||||
var data = UserLogin.GetSignaturex();
|
var data = UserLogin.GetSignaturex();
|
||||||
data += "&wx_order_id_in=" + order_ids;
|
data += "&wx_order_id_in=" + order_ids;
|
||||||
|
if (start_time != null)
|
||||||
|
data += "&start_time=" + start_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
if (end_time != null)
|
||||||
|
data += "&end_time=" + end_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
var html = await GetHtml.PostUtf8Async(url, data);
|
var html = await GetHtml.PostUtf8Async(url, data);
|
||||||
if (!html.Contains("\"code\":200"))
|
if (!html.Contains("\"code\":200"))
|
||||||
html = await GetHtml.PostUtf8Async(url, data);
|
html = await GetHtml.PostUtf8Async(url, data);
|
||||||
@@ -785,25 +1081,29 @@ public class OrderGetOrderListHelper
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="order_ids"></param>
|
/// <param name="order_ids"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<order_pdd_buyer_order>> GetPddBuyerOrders(string order_ids)
|
public static async Task<List<order_pdd_buyer_order>> GetPddBuyerOrders(string order_ids, DateTime? start_time = null, DateTime? end_time = null)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
return new List<order_pdd_buyer_order>();
|
return new List<order_pdd_buyer_order>();
|
||||||
|
|
||||||
var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
|
var url = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
|
||||||
var data4 = UserLogin.GetSignaturex();
|
var data = UserLogin.GetSignaturex();
|
||||||
data4 += "&wx_order_id_in=" + order_ids;
|
data += "&wx_order_id_in=" + order_ids;
|
||||||
var html4 = await GetHtml.PostUtf8Async(url4, data4);
|
if (start_time != null)
|
||||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
data += "&start_time=" + start_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
html4 = await GetHtml.PostUtf8Async(url4, data4);
|
if (end_time != null)
|
||||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
data += "&end_time=" + end_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
var html = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
{
|
{
|
||||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
|
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
|
||||||
}
|
}
|
||||||
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
|
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
|
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html)["data"].ParseToString())
|
||||||
.OrderByDescending(p => p.TransitCreateTime).ToList();
|
.OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||||
return pddBuyerOrders;
|
return pddBuyerOrders;
|
||||||
}
|
}
|
||||||
@@ -818,25 +1118,29 @@ public class OrderGetOrderListHelper
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="order_ids"></param>
|
/// <param name="order_ids"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<order_pdd_buyer_order>> GetTbBuyerOrders(string order_ids)
|
public static async Task<List<order_pdd_buyer_order>> GetTbBuyerOrders(string order_ids, DateTime? start_time = null, DateTime? end_time = null)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
return new List<order_pdd_buyer_order>();
|
return new List<order_pdd_buyer_order>();
|
||||||
|
|
||||||
var url4 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_order_list");
|
var url = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_order_list");
|
||||||
var data4 = UserLogin.GetSignaturex();
|
var data = UserLogin.GetSignaturex();
|
||||||
data4 += "&wx_order_id_in=" + order_ids;
|
data += "&wx_order_id_in=" + order_ids;
|
||||||
var html4 = await GetHtml.PostUtf8Async(url4, data4);
|
if (start_time != null)
|
||||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
data += "&start_time=" + start_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
html4 = await GetHtml.PostUtf8Async(url4, data4);
|
if (end_time != null)
|
||||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
data += "&end_time=" + end_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
var html = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = await GetHtml.PostUtf8Async(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
{
|
{
|
||||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
|
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
|
||||||
}
|
}
|
||||||
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
|
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
|
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html)["data"].ParseToString())
|
||||||
.OrderByDescending(p => p.TransitCreateTime).ToList();
|
.OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||||
return pddBuyerOrders;
|
return pddBuyerOrders;
|
||||||
}
|
}
|
||||||
@@ -851,25 +1155,29 @@ public class OrderGetOrderListHelper
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="order_ids"></param>
|
/// <param name="order_ids"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<order_pdd_buyer_after_sale>> GetPddBuyerAfterSales(string order_ids)
|
public static async Task<List<order_pdd_buyer_after_sale>> GetPddBuyerAfterSales(string order_ids, DateTime? start_time = null, DateTime? end_time = null)
|
||||||
{
|
{
|
||||||
var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
|
var url = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
|
||||||
var data6 = UserLogin.GetSignaturex();
|
var data = UserLogin.GetSignaturex();
|
||||||
data6 += "&wx_order_id_in=" + order_ids;
|
data += "&wx_order_id_in=" + order_ids;
|
||||||
|
if (start_time != null)
|
||||||
|
data += "&start_time=" + start_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
if (end_time != null)
|
||||||
|
data += "&end_time=" + end_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||||
if (!string.IsNullOrEmpty(order_ids))
|
if (!string.IsNullOrEmpty(order_ids))
|
||||||
{
|
{
|
||||||
var html6 = await GetHtml.PostUtf8Async(url6, data6);
|
var html = await GetHtml.PostUtf8Async(url, data);
|
||||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
html6 = await GetHtml.PostUtf8Async(url6, data6);
|
html = await GetHtml.PostUtf8Async(url, data);
|
||||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
{
|
{
|
||||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
|
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 6);
|
||||||
return new List<order_pdd_buyer_after_sale>();
|
return new List<order_pdd_buyer_after_sale>();
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
|
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||||
return pddBuyerAfterSales;
|
return pddBuyerAfterSales;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
@@ -884,25 +1192,29 @@ public class OrderGetOrderListHelper
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="order_ids"></param>
|
/// <param name="order_ids"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static async Task<List<order_pdd_buyer_after_sale>> GetTbBuyerAfterSales(string order_ids)
|
public static async Task<List<order_pdd_buyer_after_sale>> GetTbBuyerAfterSales(string order_ids, DateTime? start_time = null, DateTime? end_time = null)
|
||||||
{
|
{
|
||||||
var url6 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_after_sale_list");
|
var url = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_after_sale_list");
|
||||||
var data6 = UserLogin.GetSignaturex();
|
var data = UserLogin.GetSignaturex();
|
||||||
data6 += "&wx_order_id_in=" + order_ids;
|
data += "&wx_order_id_in=" + order_ids;
|
||||||
|
if (start_time != null)
|
||||||
|
data += "&start_time=" + start_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
if (end_time != null)
|
||||||
|
data += "&end_time=" + end_time.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||||
if (!string.IsNullOrEmpty(order_ids))
|
if (!string.IsNullOrEmpty(order_ids))
|
||||||
{
|
{
|
||||||
var html6 = await GetHtml.PostUtf8Async(url6, data6);
|
var html = await GetHtml.PostUtf8Async(url, data);
|
||||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
html6 = await GetHtml.PostUtf8Async(url6, data6);
|
html = await GetHtml.PostUtf8Async(url, data);
|
||||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
{
|
{
|
||||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
|
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 6);
|
||||||
return new List<order_pdd_buyer_after_sale>();
|
return new List<order_pdd_buyer_after_sale>();
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
|
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||||
return pddBuyerAfterSales;
|
return pddBuyerAfterSales;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
|
|||||||
@@ -252,31 +252,45 @@
|
|||||||
</EventTrigger>
|
</EventTrigger>
|
||||||
</Image.Triggers>
|
</Image.Triggers>
|
||||||
</Image>
|
</Image>
|
||||||
<CheckBox
|
<WrapPanel>
|
||||||
x:Name="chkAutoReadOrder"
|
<CheckBox
|
||||||
Margin="2,0"
|
x:Name="chkAutoReadOrder"
|
||||||
HorizontalAlignment="Left"
|
Margin="2,0"
|
||||||
VerticalAlignment="Center"
|
HorizontalAlignment="Left"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
VerticalAlignment="Center"
|
||||||
Checked="chkAutoReadBuyerOrder_CheckedChanged"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Content="自动读单"
|
Checked="chkAutoReadBuyerOrder_CheckedChanged"
|
||||||
FontSize="12"
|
Content="自动读单"
|
||||||
IsChecked="true"
|
FontSize="12"
|
||||||
Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
|
IsChecked="true"
|
||||||
|
Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkSyncDirectOrderWaybill"
|
x:Name="chkSyncDirectOrderWaybill"
|
||||||
Margin="2,0"
|
Margin="2,0"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Opacity="0.5"
|
d:Opacity="0.5"
|
||||||
d:Visibility="Visible"
|
d:Visibility="Visible"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Click="chkSyncDirectOrderWaybill_Click"
|
Click="chkSyncDirectOrderWaybill_Click"
|
||||||
Content="同步物流单"
|
Content="同步物流单"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
IsChecked="False"
|
IsChecked="False"
|
||||||
Visibility="Collapsed" />
|
Visibility="Collapsed" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkNextFullReadOrder"
|
||||||
|
Margin="2,0"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
d:Opacity="0.5"
|
||||||
|
d:Visibility="Visible"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Content="下次全量读单"
|
||||||
|
FontSize="12"
|
||||||
|
IsChecked="{Binding isReadFullOrder}"
|
||||||
|
Visibility="Visible" />
|
||||||
|
</WrapPanel>
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
|
|
||||||
<wpf:SpacingStackPanel Grid.Column="13" HorizontalSpacing="5">
|
<wpf:SpacingStackPanel Grid.Column="13" HorizontalSpacing="5">
|
||||||
|
|||||||
@@ -62,6 +62,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
private static readonly object locker = new object();
|
private static readonly object locker = new object();
|
||||||
public static bool IsAutoBuy { get; set; } = false;
|
public static bool IsAutoBuy { get; set; } = false;
|
||||||
public static DateTime LastGetOrderTime { get; set; } = DateTime.MinValue;
|
public static DateTime LastGetOrderTime { get; set; } = DateTime.MinValue;
|
||||||
|
|
||||||
|
public bool _isReadFullOrder = true;
|
||||||
|
/// <summary> 全量读取订单 </summary>
|
||||||
|
public bool isReadFullOrder
|
||||||
|
{
|
||||||
|
get { return _isReadFullOrder; }
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (_isReadFullOrder != value)
|
||||||
|
_isReadFullOrder = value;
|
||||||
|
OnPropertyChanged(new PropertyChangedEventArgs("isReadFullOrder"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public CheckBox chkSelectAll = null;
|
public CheckBox chkSelectAll = null;
|
||||||
OrderFilterConfig _orderFilterConfig;
|
OrderFilterConfig _orderFilterConfig;
|
||||||
public OrderFilterConfig orderFilterConfig
|
public OrderFilterConfig orderFilterConfig
|
||||||
@@ -331,8 +345,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary> 全量读取订单 </summary>
|
|
||||||
public bool isReadFullOrder = true;
|
|
||||||
public bool hasReadOrder = false;
|
public bool hasReadOrder = false;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 批量拉取订单
|
/// 批量拉取订单
|
||||||
@@ -357,279 +369,74 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
if (isReadFullOrder || !string.IsNullOrEmpty(orderIds))
|
if (isReadFullOrder || !string.IsNullOrEmpty(orderIds))
|
||||||
{
|
{
|
||||||
//isReadFullOrder = false;
|
if (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds))
|
||||||
|
|
||||||
bool hasGetPage = false;
|
|
||||||
int page = 0;
|
|
||||||
int totalPage = 1;
|
|
||||||
int pageSize = 50;
|
|
||||||
#if DEBUG
|
|
||||||
pageSize = 200;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
|
|
||||||
{
|
{
|
||||||
if (showReadOrderMsg)
|
try
|
||||||
BottomMsg = "当前正在读取订单...,第" + (page + 1) + "页" + (hasGetPage == false ? "" : ("/共" + totalPage + "页"));
|
|
||||||
if (page >= totalPage)
|
|
||||||
{
|
{
|
||||||
break;
|
var thisGetOrderTime = DateTime.Now.AddMinutes(-2);
|
||||||
}
|
|
||||||
await Dispatcher.InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
imgLoading.Visibility = Visibility.Visible;
|
|
||||||
btnSearch.IsEnabled = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
page++;
|
await OrderGetOrderListHelper.GetWxOrderAsync(showReadOrderMsg, orderIds);
|
||||||
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
await disPlayOrderTabOrderCountAsync();
|
||||||
var data = UserLogin.GetSignaturex() + "&page=" + page;
|
|
||||||
if (!string.IsNullOrEmpty(orderIds))
|
|
||||||
data += "&erp_order_id_in=" + orderIds;
|
|
||||||
if (page > 1)
|
|
||||||
data += "&is_not_count=true";
|
|
||||||
data += "&page_size=" + pageSize;
|
|
||||||
var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
|
||||||
//指定订单id的查询,不再查询店铺id
|
|
||||||
if (string.IsNullOrEmpty(orderIds))
|
|
||||||
data += "&erp_shop_id_in=" + shop_id;
|
|
||||||
|
|
||||||
// 按过滤条件读取 已废弃
|
// 第一次完整读单后设置为增量读单
|
||||||
//if (filterGetCondition)
|
if (IsAutoReadOrder && string.IsNullOrEmpty(orderIds))
|
||||||
//{
|
|
||||||
// if (!string.IsNullOrEmpty(orderFilterConfig.txtFilterShopNameText))
|
|
||||||
// {
|
|
||||||
// var shopNames = orderFilterConfig.txtFilterShopNameText.Split(';').Where(s => !s.IsNullOrEmpty()).ToList();
|
|
||||||
// shop_id = string.Join(",", GlobalConfig.ShopLoginList.Where(s => shopNames.Contains(s.ShopAccount)).Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
var startTime = BaseClass.DateTimeToTimestampSeconds(DateStart);
|
|
||||||
var endTime = BaseClass.DateTimeToTimestampSeconds(DateEnd.AddDays(1));
|
|
||||||
if (!IsEndDate)
|
|
||||||
endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(1));
|
|
||||||
// 查询单一订单号订单,不按时间范围搜索
|
|
||||||
if (string.IsNullOrEmpty(orderIds) || orderIds.Split(new string[] { ";", ";", ",", "," }, StringSplitOptions.RemoveEmptyEntries).ToList().Count != 1)
|
|
||||||
{
|
|
||||||
data += "&start_time=" + startTime;
|
|
||||||
data += "&end_time=" + endTime;
|
|
||||||
}
|
|
||||||
await Task.Delay(200);
|
|
||||||
|
|
||||||
var html = await GetHtml.PostUtf8Async(url, data);
|
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
|
||||||
html = await GetHtml.PostUtf8Async(url, data);
|
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
|
||||||
{
|
|
||||||
BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
var totalCount = BaseRegex.GetIntJson(ref html, "count");
|
|
||||||
if (totalCount > 0)
|
|
||||||
{
|
|
||||||
hasGetPage = true;
|
|
||||||
totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
var seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
|
||||||
|
|
||||||
var jArr = JObject.Parse(html)["data"];
|
|
||||||
if (jArr.Count() == 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
var order_ids = string.Join(",", jArr.Select(a => a["order_id"].ParseToString()));
|
|
||||||
|
|
||||||
// 读取订单详情
|
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
|
||||||
await Task.Delay(100);
|
|
||||||
List<oms_wei_order_item_info> orderItems = await OrderGetOrderListHelper.GetOrderItemInfo(order_ids);
|
|
||||||
|
|
||||||
// 读取售后单
|
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
|
||||||
await Task.Delay(100);
|
|
||||||
List<oms_wei_refund_info> refunds = await OrderGetOrderListHelper.GetOrderRefundInfo(order_ids);
|
|
||||||
|
|
||||||
// 读订单扩展
|
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
|
||||||
await Task.Delay(100);
|
|
||||||
List<order_item_ext> orderItemExts = await OrderGetOrderListHelper.GetOrderItemExts(order_ids);
|
|
||||||
if (string.IsNullOrEmpty(order_ids))
|
|
||||||
{
|
|
||||||
foreach (var oie in orderItemExts)
|
|
||||||
{
|
{
|
||||||
// 移除订单物流异常信息,每次批量读单最后要去微信获取
|
isReadFullOrder = false;
|
||||||
// 改为后台模拟读取不存在则设置为 ""
|
LastGetOrderTime = thisGetOrderTime;
|
||||||
//oie.abnormal_text = "";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
// 读取中转仓拍单订单
|
|
||||||
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 buyMapList = await OrderGetOrderListHelper.GetBuyProdMap(orderItems);
|
|
||||||
|
|
||||||
// 读取关联拍单的所有sku
|
|
||||||
var buyMapSkusList = await OrderGetOrderListHelper.GetBuyProdMapSkus(orderItems);
|
|
||||||
|
|
||||||
// 读取物流轨迹
|
|
||||||
var ewaybillLst = await OrderGetOrderListHelper.GetEWaybillPath(order_ids);
|
|
||||||
|
|
||||||
var orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JsonHelper.SerializeObject(jArr));
|
|
||||||
// 装载订单
|
|
||||||
foreach (var order in orders)
|
|
||||||
{
|
{
|
||||||
try
|
BaseMsgWindow.ShowAnimateMessage("全量读取订单发生错误 " + ex.Message);
|
||||||
{
|
|
||||||
//装载订单商品详情
|
|
||||||
order.OrderItems = new ObservableCollection<oms_wei_order_item_info>();
|
|
||||||
foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
|
|
||||||
{
|
|
||||||
// 订单商品
|
|
||||||
item.ItemOrder = order;
|
|
||||||
order.OrderItems.Add(item);
|
|
||||||
|
|
||||||
item.OrderItemExt = orderItemExts.FirstOrDefault(ext => ext.order_id == item.order_id && item.sku_id == item.sku_id);
|
|
||||||
|
|
||||||
// 已放到赋值函数中处理
|
|
||||||
// 更新店铺是否加入代发情况
|
|
||||||
//item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == item.order_id);
|
|
||||||
//Dispatcher.Invoke(new Action(() => { item.UpdateOrderItemBuyButton(); }));
|
|
||||||
|
|
||||||
// 关联拍单关系 // 危险物品禁止拍单,仅关联安全商品
|
|
||||||
//if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
|
|
||||||
{
|
|
||||||
var pddBuyMapLst = buyMapList.Where(m => m.platform == "pdd").ToList();
|
|
||||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
|
||||||
if (item.PddBuyMap == null)
|
|
||||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
|
||||||
if (item.PddBuyMap == null)
|
|
||||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
|
||||||
if (item.PddBuyMap == null)
|
|
||||||
item.PddBuyMap = pddBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
|
||||||
}
|
|
||||||
item.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();
|
|
||||||
|
|
||||||
{
|
|
||||||
var tbBuyMapLst = buyMapList.Where(m => m.platform == "tb").ToList();
|
|
||||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
|
|
||||||
if (item.TbBuyMap == null)
|
|
||||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.out_product_id);
|
|
||||||
if (item.TbBuyMap == null)
|
|
||||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.product_id);
|
|
||||||
if (item.TbBuyMap == null)
|
|
||||||
item.TbBuyMap = tbBuyMapLst.FirstOrDefault(b => b.sku_code == item.SkuAttrStr && b.spu_code == item.product_id);
|
|
||||||
}
|
|
||||||
item.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 (item.ItemOrder.OrderItems.Count > 1)
|
|
||||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id && t.order_sku_id == item.sku_id));
|
|
||||||
else
|
|
||||||
item.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == item.order_id));
|
|
||||||
item.ItemTransitOrderAfterSales = transitAfterSaleList.Where(a => item.ItemTransitOrders.Any(t => t.out_order_no == a.order_code || t.order_code == a.order_code)).ToList();
|
|
||||||
item.DistribReturnOrderInfos = transitReturnOrderList.Where(tr => tr.order_code_source == item.order_id).ToList();
|
|
||||||
item.ItemTransitExtraOrders = transitExtraPackageList.Where(p => item.ItemTransitOrders.Any(t => t.order_code == p.order_code)).ToList();
|
|
||||||
|
|
||||||
// 中转仓买手订单(wx_send_type等于0)
|
|
||||||
item.PddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
|
||||||
// 中转仓买手退货订单(wx_send_type等于0)
|
|
||||||
item.PddBuyerAfterSales = pddBuyerAfterSales.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 0).ToList();
|
|
||||||
// 直发买手订单(wx_send_type等于1)
|
|
||||||
item.DirectPddBuyerOrders = pddBuyerOrders.Where(po => po.wx_order_id == item.order_id && po.wx_sku_id == item.sku_id && po.wx_send_type == 1).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())];
|
|
||||||
|
|
||||||
// 读取订单后立即赋值,防止滚动时实时赋值造成卡顿
|
|
||||||
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 FilterOneOrder(order);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (page % 5 == 1 || page >= totalPage)
|
|
||||||
await disPlayOrderTabOrderCount();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (LastGetOrderTime == DateTime.MinValue || LastGetOrderTime < DateStart)
|
if (IsAutoReadOrder)
|
||||||
LastGetOrderTime = DateStart;
|
{
|
||||||
await OrderGetOrderListHelper.GetWxOrderIncrementAsync(LastGetOrderTime);
|
if (LastGetOrderTime == DateTime.MinValue || LastGetOrderTime < DateStart)
|
||||||
|
LastGetOrderTime = DateStart;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var thisGetOrderTime = DateTime.Now.AddMinutes(-2);
|
||||||
|
|
||||||
|
await OrderGetOrderListHelper.GetWxOrderIncrementAsync(LastGetOrderTime);
|
||||||
|
await disPlayOrderTabOrderCountAsync();
|
||||||
|
|
||||||
|
if (IsAutoReadOrder)
|
||||||
|
LastGetOrderTime = thisGetOrderTime;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
BaseMsgWindow.ShowAnimateMessage("增量读取订单发生错误 " + ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理店铺后台物流异常单
|
// 处理店铺后台物流异常单
|
||||||
if (showReadOrderMsg)
|
if (showReadOrderMsg)
|
||||||
BottomMsg = "当前正在读取物流异常单...";
|
BottomMsg = "当前正在读取物流异常单...";
|
||||||
if (string.IsNullOrEmpty(orderIds))
|
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||||
await GetShopWaybillExceptionOrder();
|
await GetShopWaybillExceptionOrder();
|
||||||
|
|
||||||
// 处理拒收单
|
// 处理拒收单
|
||||||
if (showReadOrderMsg)
|
if (showReadOrderMsg)
|
||||||
BottomMsg = "当前正在处理拒收单...";
|
BottomMsg = "当前正在处理拒收单...";
|
||||||
if (string.IsNullOrEmpty(orderIds))
|
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||||
await AutoUpdateTransitRejectedToPddShop();
|
await AutoUpdateTransitRejectedToPddShop();
|
||||||
|
|
||||||
// 处理中转仓退货包裹
|
// 处理中转仓退货包裹
|
||||||
if (showReadOrderMsg)
|
if (showReadOrderMsg)
|
||||||
BottomMsg = "当前正在处理拦截退回总店...";
|
BottomMsg = "当前正在处理拦截退回总店...";
|
||||||
if (string.IsNullOrEmpty(orderIds))
|
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||||
await AutoUpdateTransitPackageToPddShop();
|
await AutoUpdateTransitPackageToPddShop();
|
||||||
|
|
||||||
// 处理退货仓分销退货
|
// 处理退货仓分销退货
|
||||||
if (showReadOrderMsg)
|
if (showReadOrderMsg)
|
||||||
BottomMsg = "当前正在处理分销退货...";
|
BottomMsg = "当前正在处理分销退货...";
|
||||||
if (string.IsNullOrEmpty(orderIds))
|
if (string.IsNullOrEmpty(orderIds) && IsAutoReadOrder)
|
||||||
{
|
{
|
||||||
await DoReturnOrderBuyerRefendSlient();
|
await DoReturnOrderBuyerRefendSlient();
|
||||||
await DoReturnOrderTransitCreateSlient();
|
await DoReturnOrderTransitCreateSlient();
|
||||||
@@ -796,7 +603,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
orderItem.OrderItemExt = orderExt;
|
orderItem.OrderItemExt = orderExt;
|
||||||
|
|
||||||
InitOrderObservableProp(order);
|
InitOrderObservableProp(order);
|
||||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
await MainWindow.Instance.orderListCtrl.FilterOneOrder(order);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -807,7 +614,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (index % 10 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1)
|
if (index % 10 == 0 || index >= GlobalConfig.ShopLoginList.Count - 1)
|
||||||
await Task.Run(() => disPlayOrderTabOrderCount());
|
await Task.Run(() => disPlayOrderTabOrderCountAsync());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1090,7 +897,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task disPlayOrderTabOrderCount()
|
public async Task disPlayOrderTabOrderCountAsync()
|
||||||
{
|
{
|
||||||
//var orders = string.Join("','", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
//var orders = string.Join("','", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
||||||
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
|
||||||
@@ -1195,7 +1002,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
this.lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
await disPlayOrderTabOrderCount();
|
await disPlayOrderTabOrderCountAsync();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -1270,7 +1077,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
if (updateTabCount)
|
if (updateTabCount)
|
||||||
{
|
{
|
||||||
await disPlayOrderTabOrderCount();
|
await disPlayOrderTabOrderCountAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1636,8 +1636,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
orderItem.ItemOrder.gift_order_status = 1;
|
orderItem.ItemOrder.gift_order_status = 1;
|
||||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
|
|
||||||
});
|
});
|
||||||
|
await MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-60
@@ -1,4 +1,5 @@
|
|||||||
using _29WxOrderWpf.ViewModels;
|
using _29WxOrderWpf.BaseWindows;
|
||||||
|
using _29WxOrderWpf.ViewModels;
|
||||||
using AllBase;
|
using AllBase;
|
||||||
using AllBase.DouYinModel.Param.ConfigManage;
|
using AllBase.DouYinModel.Param.ConfigManage;
|
||||||
using AllBase.Helper;
|
using AllBase.Helper;
|
||||||
@@ -50,7 +51,7 @@ namespace _29WxOrderWpf
|
|||||||
ConfigHelper.SaveConfig("buy_config_260708", GlobalConfig.BuyConfig);
|
ConfigHelper.SaveConfig("buy_config_260708", GlobalConfig.BuyConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void UpdateBalance()
|
public static async Task UpdateBalance()
|
||||||
{
|
{
|
||||||
var url3 = BaseClass.Build29WxObjString("user/get_all_user");
|
var url3 = BaseClass.Build29WxObjString("user/get_all_user");
|
||||||
var data3 = UserLogin.GetSignaturex();
|
var data3 = UserLogin.GetSignaturex();
|
||||||
@@ -70,70 +71,18 @@ namespace _29WxOrderWpf
|
|||||||
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
||||||
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
||||||
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
|
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
|
try
|
||||||
{
|
{
|
||||||
var jArr = AllBase.JsonHelper.JObjectParse(html)["data"] as JArray;
|
//await UserLogin.GetUserOemAmount(16);
|
||||||
foreach (var r in jArr)
|
//await UserLogin.GetUserOemAmount(20);
|
||||||
{
|
//await UserLogin.GetUserOemAmount(26);
|
||||||
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)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
throw new Exception(ex.Message);
|
BaseMsgWindow.ShowError("更新账户余额失败 " + ex.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@ using AllBase.DouYinModel.Param.LoginManage;
|
|||||||
using NaiBa.Util;
|
using NaiBa.Util;
|
||||||
using NaiBa.Util.Extension;
|
using NaiBa.Util.Extension;
|
||||||
using NaiBa.Util.Helper;
|
using NaiBa.Util.Helper;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
@@ -99,7 +100,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnLogin_Click(object sender, RoutedEventArgs e)
|
private async void btnLogin_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
UserLogin ul = new UserLogin();
|
UserLogin ul = new UserLogin();
|
||||||
ul.Mobile = cmbUserNameMobile.Text;
|
ul.Mobile = cmbUserNameMobile.Text;
|
||||||
@@ -128,7 +129,17 @@ namespace _29WxOrderWpf.Windows.LoginWindows
|
|||||||
BaseMsgForm.ShowError(message, "登录失败");
|
BaseMsgForm.ShowError(message, "登录失败");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
try
|
||||||
|
{
|
||||||
|
//await UserLogin.GetUserOemAmount(16);
|
||||||
|
//await UserLogin.GetUserOemAmount(20);
|
||||||
|
//await UserLogin.GetUserOemAmount(26);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
BaseMsgWindow.ShowError("更新账户信息失败 " + ex.Message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (BaseClass.Remember)
|
if (BaseClass.Remember)
|
||||||
{
|
{
|
||||||
Initialization i = new Initialization();
|
Initialization i = new Initialization();
|
||||||
@@ -154,6 +165,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
|
|||||||
MainWindow.Instance.lblDebug.Content = "[Dev]";
|
MainWindow.Instance.lblDebug.Content = "[Dev]";
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||||
this.IsLogin = true;
|
this.IsLogin = true;
|
||||||
this.Close();
|
this.Close();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -238,6 +238,8 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
|
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
|
||||||
|
if (transitOrder == null)
|
||||||
|
continue;
|
||||||
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||||
{
|
{
|
||||||
oms_wei_order_item_info = OrderItem,
|
oms_wei_order_item_info = OrderItem,
|
||||||
@@ -262,7 +264,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
|||||||
|
|
||||||
UpperWaybill = (transitAftersaleOrder.return_express_company + "-" + transitAftersaleOrder.refund_waybill).Trim('-'),
|
UpperWaybill = (transitAftersaleOrder.return_express_company + "-" + transitAftersaleOrder.refund_waybill).Trim('-'),
|
||||||
DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
|
DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
|
||||||
BuyRefundStatus = transitOrder.refund_status,
|
BuyRefundStatus = transitOrder?.refund_status,
|
||||||
|
|
||||||
CreateTime = transitAftersaleOrder.created_time,
|
CreateTime = transitAftersaleOrder.created_time,
|
||||||
PickUpTime = transitAftersaleOrder.pickup_time,
|
PickUpTime = transitAftersaleOrder.pickup_time,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using AllBase;
|
using AllBase;
|
||||||
using NaiBa.Util.Extension;
|
using NaiBa.Util.Extension;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Dynamic;
|
using System.Dynamic;
|
||||||
@@ -7,6 +8,7 @@ using System.Linq;
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Work
|
namespace Work
|
||||||
{
|
{
|
||||||
@@ -232,6 +234,72 @@ namespace Work
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static async Task GetUserOemAmount(int type)
|
||||||
|
{
|
||||||
|
var url3 = BaseClass.Build29WxObjString("user/GetUserMarkups");
|
||||||
|
var data3 = UserLogin.GetSignPostData(new { PaymentType = type });
|
||||||
|
var html = await GetHtml.PostJsonAsync(url3, data3);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = await GetHtml.PostJsonAsync(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 (r["level"].ParseToInt() == 1)
|
||||||
|
{
|
||||||
|
BaseClass.ParentOemId = r["oemId"].ParseToString();
|
||||||
|
BaseClass.ParentOemGiftAmount = r["markup"].ParseToInt() * 0.01m;
|
||||||
|
}
|
||||||
|
else if (r["level"].ParseToInt() == 2)
|
||||||
|
{
|
||||||
|
BaseClass.OemId = r["oemId"].ParseToString();
|
||||||
|
BaseClass.OemGiftAmount = r["markup"].ParseToInt() * 0.01m;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (type == 20)
|
||||||
|
{
|
||||||
|
if (r["level"].ParseToInt() == 1)
|
||||||
|
{
|
||||||
|
BaseClass.ParentOemId = r["oemId"].ParseToString();
|
||||||
|
BaseClass.ParentPostageOemAmount = r["markup"].ParseToInt() * 0.01m;
|
||||||
|
}
|
||||||
|
else if (r["level"].ParseToInt() == 2)
|
||||||
|
{
|
||||||
|
BaseClass.OemId = r["oemId"].ParseToString();
|
||||||
|
BaseClass.PostageOemAmount = r["markup"].ParseToInt() * 0.01m;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (type == 26)
|
||||||
|
{
|
||||||
|
if (r["level"].ParseToInt() == 1)
|
||||||
|
{
|
||||||
|
BaseClass.ParentOemId = r["oemId"].ParseToString();
|
||||||
|
BaseClass.ParentRefundPostageOemAmount = r["markup"].ParseToInt() * 0.01m;
|
||||||
|
}
|
||||||
|
else if (r["level"].ParseToInt() == 2)
|
||||||
|
{
|
||||||
|
BaseClass.OemId = r["oemId"].ParseToString();
|
||||||
|
BaseClass.RefundPostageOemAmount = r["markup"].ParseToInt() * 0.01m;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception(ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw new Exception(BaseRegex.GetStringJsonByRegs(ref html, html, "msg"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 注册账户
|
/// 注册账户
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ namespace TemuKJD.ToolForms
|
|||||||
// (拍单后)回调函数,过滤订单
|
// (拍单后)回调函数,过滤订单
|
||||||
private Func<oms_wei_order_info, bool, Task> filterOrderAction = null;
|
private Func<oms_wei_order_info, bool, Task> filterOrderAction = null;
|
||||||
// (拍单后)回调函数,更新拍单余额
|
// (拍单后)回调函数,更新拍单余额
|
||||||
private Action updateBalanceAction = null;
|
private Func<Task> updateBalanceAction = null;
|
||||||
|
|
||||||
string _txtBuyTransitWarehouseStr = "";
|
string _txtBuyTransitWarehouseStr = "";
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -145,7 +145,7 @@ namespace TemuKJD.ToolForms
|
|||||||
bool HasChangeAddress = false;
|
bool HasChangeAddress = false;
|
||||||
|
|
||||||
|
|
||||||
public PddMobileBuyOrderForm(Func<oms_wei_order_info, bool, Task> filterOrder, Action updateBalance, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
|
public PddMobileBuyOrderForm(Func<oms_wei_order_info, bool, Task> filterOrder, Func<Task> updateBalance, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
|
|||||||
@@ -34,9 +34,9 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
public partial class WXGetBalanceQrCodeForm : BaseForms.BaseGeneralForm
|
public partial class WXGetBalanceQrCodeForm : BaseForms.BaseGeneralForm
|
||||||
{
|
{
|
||||||
// (拍单后)回调函数,更新拍单余额
|
// (拍单后)回调函数,更新拍单余额
|
||||||
private Action updateBalanceAction = null;
|
private Func<Task> updateBalanceAction = null;
|
||||||
|
|
||||||
public WXGetBalanceQrCodeForm(Action updateBalance = null)
|
public WXGetBalanceQrCodeForm(Func<Task> updateBalance = null)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
updateBalanceAction = updateBalance;
|
updateBalanceAction = updateBalance;
|
||||||
@@ -106,7 +106,7 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
pictureBox2.Visible = false;
|
pictureBox2.Visible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnBalanceTopUp_Click(object sender, EventArgs e)
|
private async void btnBalanceTopUp_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/alipay/pay";
|
string url2 = "https://po.e57.cn/prod-api/api/oms-api/alipay/pay";
|
||||||
var data = new JObject();
|
var data = new JObject();
|
||||||
@@ -135,7 +135,7 @@ namespace Work._29Tools.Forms.UserForms
|
|||||||
loginForm.ShowDialog();
|
loginForm.ShowDialog();
|
||||||
if (updateBalanceAction != null)
|
if (updateBalanceAction != null)
|
||||||
{
|
{
|
||||||
updateBalanceAction();
|
await updateBalanceAction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user