Compare commits

..
40 Commits
Author SHA1 Message Date
wule c6b8d3a83a 新版本号 2026-11-19 18:06:04 +08:00
wule 65caf003aa 优化拍单 2026-11-19 18:05:10 +08:00
wule 00e0503dec 新版本号 2026-11-19 17:59:11 +08:00
wule 4c4124f3ee 同上一条 2026-11-19 17:28:42 +08:00
wule a1e4ff1eea 优化拍单 2026-11-19 17:26:57 +08:00
wule fe13744a9e 新版本号 2026-11-19 12:33:54 +08:00
wule 42d2e23406 新代理规则 2026-11-19 11:50:48 +08:00
wule e785536152 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-19 11:43:39 +08:00
wule 5e453e2927 优化读单 2026-11-19 11:43:09 +08:00
wule 44553b43d1 新版本号 (该版本更新了上海仓仓库地址) 2026-11-17 16:47:02 +08:00
wule 171064f03f 增量读取订单功能 90% 新的二级oem 50% 2026-11-17 16:43:47 +08:00
wule e3f4e34def 添加新扣费选项筛选条件 2026-11-16 13:41:36 +08:00
wule 9e10d29bfe 修改订单读取函数 2026-11-13 19:37:46 +08:00
wule 8008dfb527 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-13 14:48:52 +08:00
wule 4ca9c082a1 新版本号 2026-11-13 14:48:46 +08:00
wule 5f08abec0f Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-13 14:48:12 +08:00
wule b8674a11c5 优化礼物单问题 2026-11-13 14:48:01 +08:00
wule 5ef326d19c 新版本号 2026-11-12 19:09:29 +08:00
wule 2295b0df48 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-12 19:08:40 +08:00
wule 15b8288a98 优化中转仓处理逻辑 2026-11-12 19:08:35 +08:00
chfei d9e8011564 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-12 15:36:28 +08:00
chfei fb8e6a5479 自动读单 增加启动参数控制 2026-11-12 15:36:22 +08:00
wule c7cdf3ff88 新版本号 2026-11-12 11:33:09 +08:00
wule 82165f25a8 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-12 11:31:45 +08:00
wule fe8f9851fe 修改繁体字拍单地址可用逻辑 2026-11-12 11:31:41 +08:00
wule 3d091462c5 新版本号 2026-11-11 18:50:50 +08:00
chfei 78a64aa661 利润统计 增加快递费筛选
快递费 页面支持导出全部
2026-11-11 18:24:46 +08:00
wule 71614f64e4 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-11 17:55:45 +08:00
wule 04a8ba0472 快递费明细页面调整 2026-11-11 17:55:37 +08:00
wule a93ab77028 新版本号 2026-11-11 16:27:05 +08:00
wule d17cb0f139 优化作废按钮显示逻辑 2026-11-11 16:21:32 +08:00
wule 60db6f933d Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-11 14:50:17 +08:00
wule 761e3f102f 读单相关信息查询全部改为异步调用 2026-11-11 14:50:05 +08:00
wule 98531e0344 新版本号 2026-11-10 19:42:02 +08:00
wule ee10fb5ea8 优化名称显示 2026-11-10 19:41:25 +08:00
wule 79b0027b7e 优化读单 2026-11-10 17:33:34 +08:00
wule 344cbb4ac2 过滤订单使用异步方法 优化中转仓额外包裹逻辑 2026-11-10 16:34:57 +08:00
wule 200e5bc8c8 优化更新拍单金额等操作 2026-11-10 13:58:14 +08:00
wule 4b554b55d9 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-10 10:39:15 +08:00
wule dadbb67914 小改动 2026-11-10 10:39:06 +08:00
49 changed files with 2631 additions and 1493 deletions

No files matched your search

@@ -201,6 +201,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
buyerReadOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerReadOrderConfig>("pdd_buyer_read_order_config"); buyerReadOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerReadOrderConfig>("pdd_buyer_read_order_config");
if (buyerReadOrderConfig == null) if (buyerReadOrderConfig == null)
buyerReadOrderConfig = new BuyerReadOrderConfig(); buyerReadOrderConfig = new BuyerReadOrderConfig();
if (Environment.GetCommandLineArgs().Contains("aro=f"))
{
buyerReadOrderConfig.IsAutoReadOrder = false;
}
this.chkAutoReadBuyerOrder.IsChecked = buyerReadOrderConfig.IsAutoReadOrder; this.chkAutoReadBuyerOrder.IsChecked = buyerReadOrderConfig.IsAutoReadOrder;
this.chkAutoAfterSale.IsChecked = buyerReadOrderConfig.IsAutoAfterSale; this.chkAutoAfterSale.IsChecked = buyerReadOrderConfig.IsAutoAfterSale;
@@ -569,52 +575,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList; return transitOrderList;
} }
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_pdd_buyer_after_sale> GetOrderAfterSales(string order_ids) public static List<order_pdd_buyer_after_sale> GetOrderAfterSales(string order_ids)
{ {
if (order_ids.IsNullOrEmpty()) if (order_ids.IsNullOrEmpty())
@@ -761,7 +721,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
// 装载同步单 // 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList) foreach (var syncOrder in syncOrderList)
{ {
if (!lstSyncLogistics.Contains(syncOrder)) if (!lstSyncLogistics.Contains(syncOrder))
@@ -781,16 +741,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList(); var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids); //var buyerAfterSales = GetOrderAfterSales(order_ids);
// 处理这些获取到的微信订单 // 处理这些获取到的微信订单
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -816,7 +776,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (wxOrder != null) if (wxOrder != null)
{ {
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 ""; 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) if (wxOrderItem != null)
{ {
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -837,7 +797,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no); 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; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(o, shopOrder, orderItem, transit_item); UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
} }
@@ -1124,12 +1084,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1165,7 +1125,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr); var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
if (wxOrder != null) 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) if (wxOrderItem != null)
{ {
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -1179,7 +1139,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transitItem != null) if (transitItem != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no); 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()); 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; //refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
@@ -1303,10 +1263,15 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (afterSale.orderDate < DateTime.Now.AddMonths(-2).ToString("yyMMdd").ParseToInt()) if (afterSale.orderDate < DateTime.Now.AddMonths(-2).ToString("yyMMdd").ParseToInt())
{ {
var count = lstPddBuyerAfterSaleInfoLite.ToList().Where(af => af.orderDate < DateTime.Now.AddMonths(-2).ToString("yyMMdd").ParseToInt()).Count();
if (count > 3)
{
ShowBuyerOrderReadInfo(buyer, " 近2个月售后列表获取完成,退出自动滑动 "); ShowBuyerOrderReadInfo(buyer, " 近2个月售后列表获取完成,退出自动滑动 ");
currentReadBuyer = ""; currentReadBuyer = "";
//return; //return;
} }
}
if (afterSale?.ShopIdStr == "3738859887048176128") if (afterSale?.ShopIdStr == "3738859887048176128")
{ {
@@ -2233,19 +2198,19 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder) if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder)
{ {
btn.IsEnabled = false; btn.IsEnabled = false;
Task.Run(() => Task.Run(async () =>
{ {
var out_order_nos = buyerOrder.order_sn; var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos); var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no)); var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -2261,7 +2226,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no); 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; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item); UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
@@ -2396,10 +2361,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg"); var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "取号成功"; 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) 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) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -2452,15 +2417,15 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
order.sendStatus = "修改提前取号成功"; 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) 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) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
if (transit != null) if (transit != null)
transit.pre_allocated_order_no = 1; transit.pre_allocated_order_no = 3;
} }
} }
} }
@@ -2584,7 +2549,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SetPickUpNo(PddPickInfo pddPickInfo) public async Task SetPickUpNo(PddPickInfo pddPickInfo)
{ {
List<combine_track_info> orderSnTracks = new List<combine_track_info>(); List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in pddPickInfo.combine_list) foreach (var combine in pddPickInfo.combine_list)
@@ -2599,8 +2564,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0) if (orderSnTracks.Count == 0)
return; return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn))); //var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList) foreach (var sOrder in syncOrderList)
{ {
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id); var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2681,7 +2646,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false) public async Task SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
{ {
try try
{ {
@@ -2692,7 +2657,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
// 取最新订单状态 // 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault(); var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr))?.FirstOrDefault();
if (wxOrder == null) if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在!"); throw new Exception("买手单对应微信订单不存在!");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString()); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
@@ -2762,7 +2727,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr); var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
if (mainOrder != null) 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) if (orderItem != null)
orderItem.SyncLogisticsMsg = ex.Message; orderItem.SyncLogisticsMsg = ex.Message;
} }
@@ -2838,15 +2803,15 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
})); }));
} }
// 手动调用直发外采星系 // 手动调用直发外采信息
public static string SendAfterSaleE57NeedManual(PddBuyerOrderLiteInfo order, string statusText) public static async Task<string> SendAfterSaleE57NeedManualAsync(PddBuyerOrderLiteInfo order, string statusText)
{ {
Thread.Sleep(100); Thread.Sleep(100);
// 发送过的,不再发送 // 发送过的,不再发送
if (order.OutAfterSaleStatusStr == statusText) if (order.OutAfterSaleStatusStr == statusText)
{ {
return "<code>0</code><msg>SUCCESS</msg>"; return "<code>0</code><msg>SUCCESS</msg><json_msg>{\"code\":0,\"msg\":\"SUCCESS\"}</json_msg>";
} }
JObject obj = new JObject(); JObject obj = new JObject();
@@ -2857,21 +2822,21 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var dataStr = JsonHelper.SerializeObject(obj); var dataStr = JsonHelper.SerializeObject(obj);
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/updateByOrderIdAfterSaleStatus"; string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/updateByOrderIdAfterSaleStatus";
//成功 "<ResultVo><code>0</code><msg>SUCCESS</msg><data/><totalRecords/></ResultVo>" //成功 "<ResultVo><code>0</code><msg>SUCCESS</msg><data/><totalRecords/></ResultVo>"
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
for (int i = 0; i < 3 && exportRst.Contains("操作超时"); i++) for (int i = 0; i < 3 && exportRst.Contains("操作超时"); i++)
{ {
Thread.Sleep(210000); Thread.Sleep(210000);
HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
} }
if (exportRst.Contains("SUCCESS") || exportRst.Contains("更新外采订单的售后成功") || exportRst.Contains("<code>0</code>") || exportRst.Contains("<code>200</code>")) if (exportRst.Contains("SUCCESS") || exportRst.Contains("更新外采订单的售后成功") || exportRst.Contains("\"code\":0") || exportRst.Contains("\"code\":200"))
{ {
order.OutAfterSaleStatusStr = statusText; order.OutAfterSaleStatusStr = statusText;
return exportRst; return exportRst;
} }
else else
{ {
BaseMsgWindow.ShowAnimateMessage("订单 " + order.ShopOrderIdStr + " 修改售后状态失败 服务端返回:" + BaseRegex.GetStringXmlByRegs(ref exportRst, exportRst, "msg"), "Error", 6); BaseMsgWindow.ShowAnimateMessage("订单 " + order.ShopOrderIdStr + " 修改售后状态失败 服务端返回:" + BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg"), "Error", 6);
return exportRst; return exportRst;
} }
} }
@@ -3011,13 +2976,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// </summary> /// </summary>
/// <param name="order"></param> /// <param name="order"></param>
/// <returns></returns> /// <returns></returns>
public string PddDirectAutoAfterSale(PddBuyerOrderLiteInfo order) public async Task<string> PddDirectAutoAfterSale(PddBuyerOrderLiteInfo order)
{ {
if (!order.order_status_prompt.Contains("待发货")) if (!order.order_status_prompt.Contains("待发货"))
{ {
if (order.OutAfterSaleStatusStr.IsNullOrEmpty()) if (order.OutAfterSaleStatusStr.IsNullOrEmpty())
{ {
var refundRst = SendAfterSaleE57NeedManual(order, "已发货,需手动申请售后"); var refundRst = await SendAfterSaleE57NeedManualAsync(order, "已发货,需手动申请售后");
} }
return "{\"success\":false,\"msg\":\"仅未发货单可以自动退货\"}"; return "{\"success\":false,\"msg\":\"仅未发货单可以自动退货\"}";
} }
@@ -3029,14 +2994,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// 保存退款成功状态 // 保存退款成功状态
order.order_status_prompt = "退款成功"; order.order_status_prompt = "退款成功";
// 中转仓订单买手号售后信息 存到服务端 // 中转仓订单买手号售后信息 存到服务端
var refundRst = SendAfterSaleE57NeedManual(order, "退款成功"); var refundRst = await SendAfterSaleE57NeedManualAsync(order, "退款成功");
if (refundRst.Contains("<code>0</code>") || refundRst.Contains("<code>200</code>")) if (refundRst.Contains("\"code\":0") || refundRst.Contains("\"code\":200"))
{ {
order.sendStatus = "退款成功 买手退款信息更新成功"; order.sendStatus = "退款成功 买手退款信息更新成功";
} }
else else
{ {
var msg = BaseRegex.GetStringXml(ref refundRst, "msg"); var msg = BaseRegex.GetStringJson(ref refundRst, "msg");
order.sendStatus = "退款成功 买手退款信息更新失败,服务端返回 " + msg; order.sendStatus = "退款成功 买手退款信息更新失败,服务端返回 " + msg;
} }
lock (locker) lock (locker)
@@ -3047,7 +3012,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
else else
{ {
var error_msg = BaseRegex.GetStringXmlByRegs(ref afterSaleRst, afterSaleRst, "msg", "error_msg"); var error_msg = BaseRegex.GetStringJsonByRegs(ref afterSaleRst, afterSaleRst, "msg", "error_msg");
if (string.IsNullOrEmpty(error_msg)) if (string.IsNullOrEmpty(error_msg))
error_msg = afterSaleRst; error_msg = afterSaleRst;
return "{\"success\":false,\"msg\":\"" + error_msg + "\"}"; return "{\"success\":false,\"msg\":\"" + error_msg + "\"}";
@@ -206,7 +206,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
orderItem.UpdateOrderItemBuyButton(); orderItem.UpdateOrderItemBuyButton();
} }
@@ -220,7 +220,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
orderItem.UpdateOrderItemBuyButton(); orderItem.UpdateOrderItemBuyButton();
} }
@@ -345,7 +345,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
await Task.Run(() => await Task.Run(() =>
{ {
@@ -364,7 +364,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
await Task.Run(() => await Task.Run(() =>
{ {
@@ -512,52 +512,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList; return transitOrderList;
} }
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_pdd_buyer_after_sale> GetOrderAfterSales(string order_ids) public static List<order_pdd_buyer_after_sale> GetOrderAfterSales(string order_ids)
{ {
if (order_ids.IsNullOrEmpty()) if (order_ids.IsNullOrEmpty())
@@ -648,7 +602,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
pdd_afterSale.AfterSaleAddress = buyer_after_sale?.afterSaleAddress; pdd_afterSale.AfterSaleAddress = buyer_after_sale?.afterSaleAddress;
} }
void CefReadBuyerOrder(string url, string data) async Task CefReadBuyerOrder(string url, string data)
{ {
if (data.Contains("轻奢壁挂式香皂盒置物架卫生间沥水家居可拆卸收纳盒翻盖肥皂盒")) if (data.Contains("轻奢壁挂式香皂盒置物架卫生间沥水家居可拆卸收纳盒翻盖肥皂盒"))
{ {
@@ -694,7 +648,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
// 装载同步单 // 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList) foreach (var syncOrder in syncOrderList)
{ {
if (!lstSyncLogistics.Contains(syncOrder)) if (!lstSyncLogistics.Contains(syncOrder))
@@ -714,16 +668,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList(); var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids); //var buyerAfterSales = GetOrderAfterSales(order_ids);
// 处理这些获取到的微信订单 // 处理这些获取到的微信订单
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -754,7 +708,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (wxOrder != null) if (wxOrder != null)
{ {
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 ""; 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) if (wxOrderItem != null)
{ {
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -775,7 +729,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no); 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; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(o, shopOrder, orderItem, transit_item); UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
} }
@@ -892,7 +846,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
})); }));
} }
Task.Run(() => await Task.Run(() =>
{ {
// 根据订单状态 取号/修改取号 // 根据订单状态 取号/修改取号
if (order.WxSendTypeStr == "直发") if (order.WxSendTypeStr == "直发")
@@ -1062,12 +1016,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1103,7 +1057,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr); var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
if (wxOrder != null) 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) if (wxOrderItem != null)
{ {
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -1117,7 +1071,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transitItem != null) if (transitItem != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no); 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()); 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; //refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
@@ -1810,19 +1764,19 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder) if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder)
{ {
btn.IsEnabled = false; btn.IsEnabled = false;
Task.Run(() => Task.Run(async () =>
{ {
var out_order_nos = buyerOrder.order_sn; var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos); var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no)); var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1838,7 +1792,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no); 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; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item); UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
@@ -1970,10 +1924,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg"); var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "取号成功"; 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) 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) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -2026,10 +1980,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
order.sendStatus = "修改提前取号成功"; 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) 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) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -2149,7 +2103,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SetPickUpNo(PddPickInfo pddPickInfo) public async Task SetPickUpNo(PddPickInfo pddPickInfo)
{ {
List<combine_track_info> orderSnTracks = new List<combine_track_info>(); List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in pddPickInfo.combine_list) foreach (var combine in pddPickInfo.combine_list)
@@ -2164,8 +2118,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0) if (orderSnTracks.Count == 0)
return; return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn))); //var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList) foreach (var sOrder in syncOrderList)
{ {
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id); var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2246,7 +2200,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false) public async Task SendAsyncWaybillOrder(PddBuyerOrderLiteInfo order, bool showErrBox = false)
{ {
try try
{ {
@@ -2257,7 +2211,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
// 取最新订单状态 // 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault(); var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null) if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在!"); throw new Exception("买手单对应微信订单不存在!");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString()); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
@@ -2327,7 +2281,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr); var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
if (mainOrder != null) 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) if (orderItem != null)
orderItem.SyncLogisticsMsg = ex.Message; orderItem.SyncLogisticsMsg = ex.Message;
} }
@@ -346,7 +346,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
this.txtShopGoodsNameVal = orderItem.title; this.txtShopGoodsNameVal = orderItem.title;
this.txtShopSpecNameVal = orderItem.SkuAttrStr; this.txtShopSpecNameVal = orderItem.SkuAttrStr;
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString(); 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) if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
{ {
@@ -926,7 +926,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) 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) if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
{ {
@@ -990,7 +990,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) 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) || 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) || (item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
@@ -1022,7 +1022,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// <summary> /// <summary>
/// 更新拍单成功信息 /// 更新拍单成功信息
/// </summary> /// </summary>
public void ManualUpdateBuyOrder() public async void ManualUpdateBuyOrder()
{ {
if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6) if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6)
{ {
@@ -1097,6 +1097,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
body["outOrderNo"] = "tb_" + txtBuyOrderIdVal.Trim(); // 拍单订单号 body["outOrderNo"] = "tb_" + txtBuyOrderIdVal.Trim(); // 拍单订单号
body["outAmount"] = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 body["outAmount"] = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerId"] = buyer.buyer_id; // 买手ID
body["buyerAccount"] = buyer.buyer_id; // 买手ID body["buyerAccount"] = buyer.buyer_id; // 买手ID
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号 body["express1Company"] = ""; // 物流公司编号
@@ -1112,31 +1113,28 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); 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]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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 url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var dataStr = JsonHelper.SerializeObject(body); var dataStr = JsonHelper.SerializeObject(body);
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" + //dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +
// ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}"; // ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}";
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
//<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult> //<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult>
//<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult> //<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult>
if (!exportRst.ParseToString().Contains("<code>200</code>")) if (!exportRst.ParseToString().Contains("\"code\":200"))
{
await Task.Delay(500);
exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
}
if (!exportRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = ""; string msg = "";
string code = ""; msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
try
{
System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
xmlDoc.LoadXml(exportRst);
code = xmlDoc["AjaxResult"]["code"].InnerText;
msg = xmlDoc["AjaxResult"]["msg"].InnerText;
}
catch
{
msg = exportRst.ParseToString();
}
this.ErrorMsg = "拍单保存失败,服务端返回 " + msg; this.ErrorMsg = "拍单保存失败,服务端返回 " + msg;
Enabled = true; Enabled = true;
return; return;
@@ -1,6 +1,5 @@
using _29WxOrderWpf.BaseWindows; using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.CefHelper; using _29WxOrderWpf.CefHelper;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.ViewModels; using _29WxOrderWpf.ViewModels;
using AllBase; using AllBase;
using AllBase.Helper; using AllBase.Helper;
@@ -27,12 +26,14 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using TemuKJD.ToolForms; using TemuKJD.ToolForms;
using Work; using Work;
using Work._29Tools.BLL; using Work._29Tools.BLL;
using Work._29Tools.CefTools; using Work._29Tools.CefTools;
using Work.BaseForms; using Work.BaseForms;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Helpers; using WxOrder.Framework.Helpers;
using static AllBase.DouYinModel.Result.DouOrderListInfo; using static AllBase.DouYinModel.Result.DouOrderListInfo;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView; using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
@@ -346,7 +347,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
this.txtShopGoodsNameVal = orderItem.title; this.txtShopGoodsNameVal = orderItem.title;
this.txtShopSpecNameVal = orderItem.SkuAttrStr; this.txtShopSpecNameVal = orderItem.SkuAttrStr;
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString(); 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) if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
{ {
@@ -1640,7 +1641,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) 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) if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
{ {
@@ -1704,7 +1705,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) 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) || 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) || (item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
@@ -1736,7 +1737,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// <summary> /// <summary>
/// 更新拍单成功信息 /// 更新拍单成功信息
/// </summary> /// </summary>
public void ManualUpdateBuyOrder() public async void ManualUpdateBuyOrder()
{ {
if (BuyType == "transit" && txtSourceCodeVal.ParseToString().Trim().Length != 6) if (BuyType == "transit" && txtSourceCodeVal.ParseToString().Trim().Length != 6)
{ {
@@ -1811,6 +1812,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
body["outOrderNo"] = "tb_" + txtBuyOrderIdVal.Trim(); // 拍单订单号 body["outOrderNo"] = "tb_" + txtBuyOrderIdVal.Trim(); // 拍单订单号
body["outAmount"] = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 body["outAmount"] = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerId"] = buyer.buyer_id; // 买手ID
body["buyerAccount"] = buyer.buyer_id; // 买手ID body["buyerAccount"] = buyer.buyer_id; // 买手ID
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号 body["express1Company"] = ""; // 物流公司编号
@@ -1826,31 +1828,24 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); 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]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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 url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var dataStr = JsonHelper.SerializeObject(body); var dataStr = JsonHelper.SerializeObject(body);
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" + var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
// ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}"; if (!exportRst.ParseToString().Contains("\"code\":200"))
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); {
//<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult> await Task.Delay(500);
//<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult> exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
if (!exportRst.ParseToString().Contains("<code>200</code>")) }
if (!exportRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = ""; string msg = "";
string code = ""; msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
try
{
System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
xmlDoc.LoadXml(exportRst);
code = xmlDoc["AjaxResult"]["code"].InnerText;
msg = xmlDoc["AjaxResult"]["msg"].InnerText;
}
catch (Exception ex)
{
msg = exportRst.ParseToString();
}
this.ErrorMsg = "拍单保存失败,服务端返回 " + msg; this.ErrorMsg = "拍单保存失败,服务端返回 " + msg;
Enabled = true; Enabled = true;
return; return;
@@ -433,52 +433,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList; return transitOrderList;
} }
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_tb_buyer_after_sale> GetOrderAfterSales(string order_ids) public static List<order_tb_buyer_after_sale> GetOrderAfterSales(string order_ids)
{ {
if (order_ids.IsNullOrEmpty()) if (order_ids.IsNullOrEmpty())
@@ -732,7 +686,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn)); var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn));
// 装载同步单 // 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList) foreach (var syncOrder in syncOrderList)
{ {
if (!lstSyncLogistics.Contains(syncOrder)) if (!lstSyncLogistics.Contains(syncOrder))
@@ -754,16 +708,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList(); var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids); //var buyerAfterSales = GetOrderAfterSales(order_ids);
// 处理这些获取到的微信订单 // 处理这些获取到的微信订单
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -794,7 +748,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (wxOrder != null) if (wxOrder != null)
{ {
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 ""; 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) if (wxOrderItem != null)
{ {
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -815,7 +769,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no); 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; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(o, shopOrder, orderItem, transit_item); UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
} }
@@ -1103,12 +1057,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1145,7 +1099,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr); var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
if (wxOrder != null) 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) if (wxOrderItem != null)
{ {
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -1159,7 +1113,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transitItem != null) if (transitItem != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no); 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()); 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; //refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
@@ -1667,19 +1621,19 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder) if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder)
{ {
btn.IsEnabled = false; btn.IsEnabled = false;
Task.Run(() => Task.Run(async () =>
{ {
var out_order_nos = buyerOrder.order_sn; var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos); var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no)); var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) 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)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1695,7 +1649,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no); 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; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item); UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
@@ -1832,10 +1786,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg"); var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "取号成功"; 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) 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) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -1888,10 +1842,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
order.sendStatus = "修改提前取号成功"; 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) 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) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -2011,7 +1965,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SetPickUpNo(TbPickInfo tbPickInfo) public async Task SetPickUpNo(TbPickInfo tbPickInfo)
{ {
List<combine_track_info> orderSnTracks = new List<combine_track_info>(); List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in tbPickInfo.combine_list) foreach (var combine in tbPickInfo.combine_list)
@@ -2026,8 +1980,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0) if (orderSnTracks.Count == 0)
return; return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn))); //var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList) foreach (var sOrder in syncOrderList)
{ {
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id); var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2108,7 +2062,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false) public async Task SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false)
{ {
try try
{ {
@@ -2119,7 +2073,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
// 取最新订单状态 // 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault(); var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null) if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在!"); throw new Exception("买手单对应微信订单不存在!");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString()); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
@@ -2189,7 +2143,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr); var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
if (mainOrder != null) 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) if (orderItem != null)
orderItem.SyncLogisticsMsg = ex.Message; orderItem.SyncLogisticsMsg = ex.Message;
} }
File diff suppressed because it is too large. Load diff
@@ -83,7 +83,7 @@ public partial class OrderListCtrl
{ {
sucessCount++; sucessCount++;
item.gift_order_status = 1; item.gift_order_status = 1;
foreach (var orderItem in item.orderItems) foreach (var orderItem in item.OrderItems)
{ {
InitOrderItemObservableProp(orderItem); InitOrderItemObservableProp(orderItem);
} }
@@ -109,7 +109,7 @@ public partial class OrderListCtrl
} }
SetProgress(index, count); SetProgress(index, count);
BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}"; BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}";
index++; index++;
} }
@@ -166,7 +166,7 @@ public partial class OrderListCtrl
{ {
errorCount++; errorCount++;
} }
BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}"; BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}";
index++; index++;
} }
BottomMsg = $"订单同步进度完成 成功:{sucessCount} 失败:{errorCount} 总数:{count}"; BottomMsg = $"订单同步进度完成 成功:{sucessCount} 失败:{errorCount} 总数:{count}";
@@ -203,7 +203,7 @@ public partial class OrderListCtrl
{ {
long shopid = item.Key; long shopid = item.Key;
string shopName = item.Value.FirstOrDefault()?.shop_name ?? ""; 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); var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(shopid, afterSaleOrderIds);
if (ret) if (ret)
{ {
@@ -252,6 +252,7 @@
</EventTrigger> </EventTrigger>
</Image.Triggers> </Image.Triggers>
</Image> </Image>
<WrapPanel>
<CheckBox <CheckBox
x:Name="chkAutoReadOrder" x:Name="chkAutoReadOrder"
Margin="2,0" Margin="2,0"
@@ -277,6 +278,19 @@
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">
File diff suppressed because it is too large. Load diff
@@ -51,23 +51,23 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="1" Grid.Row="1"
DataContext="{Binding orderItem}" DataContext="{Binding OrderItem}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<!--<local:OrderListRowItemCtrl <!--<local:OrderListRowItemCtrl
Grid.Row="2" Grid.Row="2"
DataContext="{Binding orderItem2}" DataContext="{Binding OrderItem2}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="3" Grid.Row="3"
DataContext="{Binding orderItem2}" DataContext="{Binding OrderItem2}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="4" Grid.Row="4"
DataContext="{Binding orderItem3}" DataContext="{Binding OrderItem3}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="5" Grid.Row="5"
DataContext="{Binding orderItem4}" DataContext="{Binding OrderItem4}"
Visibility="{Binding OrderItemVisibility}" />--> Visibility="{Binding OrderItemVisibility}" />-->
<!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}"> <!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
@@ -78,7 +78,7 @@
</ItemsControl>--> </ItemsControl>-->
<!--<ListBox <!--<ListBox
Grid.Row="1" Grid.Row="1"
ItemsSource="{Binding orderItems}" ItemsSource="{Binding OrderItems}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled"
VirtualizingStackPanel.IsVirtualizing="True" 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 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(); })); Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
} }
} }
@@ -121,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
if (this.DataContext is oms_wei_order_info order) if (this.DataContext is oms_wei_order_info order)
{ {
if (order.orderItems.Count > 5) if (order.OrderItems.Count > 5)
{ {
//txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品"; //txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
} }
@@ -1435,17 +1435,6 @@
Orientation="Vertical" Orientation="Vertical"
VerticalSpacing="6"> VerticalSpacing="6">
<Button
x:Name="btnTransitInfo"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btnTransitInfo_Click"
Content="云仓详情"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" />
<Button <Button
x:Name="btnMapSkus" x:Name="btnMapSkus"
Height="22" Height="22"
@@ -1489,6 +1478,18 @@
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnVoidTransitOrderVisibility}" /> Visibility="{Binding BtnVoidTransitOrderVisibility}" />
<Button
x:Name="btnAbnormalOrderExtraBuy"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Content="额外拍单"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnAbnormalOrderExtraBuyVisibility}" />
<Button <Button
x:Name="btnAbnormalOrderRebuy" x:Name="btnAbnormalOrderRebuy"
Height="22" Height="22"
@@ -1514,6 +1515,23 @@
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnDirectBuyOrderVisibility}" /> Visibility="{Binding BtnDirectBuyOrderVisibility}" />
<Button
x:Name="btnChangeWaybill"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnChangeWaybill_Click"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}">
<TextBlock TextAlignment="Center">
补发/修改<LineBreak />
物流</TextBlock>
</Button>
<!-- 礼品发货 --> <!-- 礼品发货 -->
<Button <Button
x:Name="btnShipGift" x:Name="btnShipGift"
@@ -1534,20 +1552,17 @@
Orientation="Vertical" Orientation="Vertical"
VerticalSpacing="5"> VerticalSpacing="5">
<Button
x:Name="btnChangeWaybill"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnChangeWaybill_Click"
Content="补发/修改物流"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
<Button
x:Name="btnTransitInfo"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btnTransitInfo_Click"
Content="云仓详情"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemTransitOrderWithVoid, Converter={StaticResource hasValueToVisibilityConverter}}" />
<!--<Button <!--<Button
x:Name="btnAddEditTransitWarehouseReject_New" x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38" MinWidth="38"
@@ -349,7 +349,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
BaseMsgWindow.ShowError("请选择买手号"); BaseMsgWindow.ShowError("请选择买手号");
return; return;
} }
if (orderItem.ItemOrder.orderItems.Count > 1) if (orderItem.ItemOrder.OrderItems.Count > 1)
{ {
if (!isAutoBuy) if (!isAutoBuy)
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持"); BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
@@ -357,7 +357,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
} }
var oldVisibility = orderItem.BtnAbnormalOrderRebuyVisibility; 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))) .Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
{ {
OrderListCtrl.InitOrderItemObservableProp(orderItem); OrderListCtrl.InitOrderItemObservableProp(orderItem);
@@ -374,10 +374,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var skuId = orderItem.sku_id; var skuId = orderItem.sku_id;
await MainWindow.Instance.orderListCtrl.GetOrder(orderId); await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId); var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
if (newOrder.orderItems.Count == 1) if (newOrder.OrderItems.Count == 1)
orderItem = newOrder?.orderItems?.FirstOrDefault(); orderItem = newOrder?.OrderItems?.FirstOrDefault();
else else
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId); orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
if (orderItem == null) if (orderItem == null)
return; return;
if (isAbnormalOrder) 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 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(); })); MainWindow.Instance.Dispatcher.Invoke(new Action(() => { oi.UpdateOrderItemBuyButton(); }));
} }
BaseMsgWindow.ShowError("请登录店铺"); BaseMsgWindow.ShowError("请登录店铺");
@@ -1302,7 +1302,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
BaseMsgWindow.ShowError("请选择买手号"); BaseMsgWindow.ShowError("请选择买手号");
return; 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("多子单或多件商品订单中转仓暂不支持");
BaseMsgWindow.ShowError("多子单订单中转仓暂不支持"); BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
@@ -1323,10 +1323,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
var skuId = orderItem.sku_id; var skuId = orderItem.sku_id;
await MainWindow.Instance.orderListCtrl.GetOrder(orderId); await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId); var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
if (newOrder?.orderItems.Count == 1) if (newOrder?.OrderItems.Count == 1)
orderItem = newOrder?.orderItems?.FirstOrDefault(); orderItem = newOrder?.OrderItems?.FirstOrDefault();
else else
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId); orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
if (orderItem == null) if (orderItem == null)
return; return;
orderItem.BtnAbnormalOrderRebuyVisibility = oldVisibility; orderItem.BtnAbnormalOrderRebuyVisibility = oldVisibility;
@@ -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);
} }
} }
} }
@@ -1974,6 +1974,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
private async void borderWarehouseStatus_MouseUp(object sender, MouseButtonEventArgs e) private async void borderWarehouseStatus_MouseUp(object sender, MouseButtonEventArgs e)
{ {
ShowTransitDetail();
}
private void btnTransitInfo_Click(object sender, RoutedEventArgs e)
{
ShowTransitDetail();
}
void ShowTransitDetail()
{
//return;
if (this.DataContext is oms_wei_order_item_info orderItem) if (this.DataContext is oms_wei_order_item_info orderItem)
{ {
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model() oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
@@ -1992,28 +2003,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}.ShowDialog(); }.ShowDialog();
} }
} }
private void btnTransitInfo_Click(object sender, RoutedEventArgs e)
{
////return;
//if (this.DataContext is oms_wei_order_item_info orderItem)
//{
// oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
// {
// OrderItem = orderItem,
// };
// OrderTransitListCtrl OrderTransitListCtrl = new OrderTransitListCtrl(transitInfo);
// new DialogWindow()
// {
// Title = "仓库订单详情 - 当前订单 " + orderItem.order_id,
// Content = OrderTransitListCtrl,
// Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
// Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
// WindowStartupLocation = WindowStartupLocation.CenterScreen,
// }.ShowDialog();
//}
}
} }
} }
@@ -197,7 +197,7 @@ public partial class OrderTransitListDetailCtrl : UserControl
{ {
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model() 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); transitListCtrl.UpdateViewModel(transitInfo);
} }
@@ -42,10 +42,10 @@ internal class OrderTransitService
await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(orderId); }); await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(orderId); });
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId); var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
if (newOrder?.orderItems.Count == 1) if (newOrder?.OrderItems.Count == 1)
orderItem = newOrder?.orderItems?.FirstOrDefault(); orderItem = newOrder?.OrderItems?.FirstOrDefault();
else else
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId); orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
if (orderItem == null) if (orderItem == null)
{ {
@@ -86,7 +86,7 @@ internal class OrderTransitService
} }
else else
{ {
var msg = BaseRegex.GetStringJson(ref discardRst, "msg"); var msg = BaseRegex.GetStringJsonByRegs(ref discardRst, discardRst, "msg");
if (!isSilent) if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg); BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
@@ -277,9 +277,9 @@ internal class OrderTransitService
if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true) if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return ""; return "";
orderItem.ItemTransitOrders = OrderListCtrl.GetTransitWarehouseList(orderItem.order_id); orderItem.ItemTransitOrders = await OrderGetOrderListHelper.GetTransitWarehouseList(orderItem.order_id);
orderItem.PddBuyerOrders = OrderListCtrl.GetPddBuyerOrders(orderItem.order_id).Where(o => o.wx_send_type == 0).ToList(); orderItem.PddBuyerOrders = (await OrderGetOrderListHelper.GetPddBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList();
orderItem.PddBuyerOrders.AddRange(OrderListCtrl.GetTbBuyerOrders(orderItem.order_id).Where(o => o.wx_send_type == 0).ToList()); orderItem.PddBuyerOrders.AddRange((await OrderGetOrderListHelper.GetTbBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList());
OrderListCtrl.InitOrderItemObservableProp(orderItem); OrderListCtrl.InitOrderItemObservableProp(orderItem);
var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no); var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no);
@@ -48,7 +48,7 @@ public partial class SettingsView : Window
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
orderItem.UpdateOrderItemBuyButton(); orderItem.UpdateOrderItemBuyButton();
orderItem.SetAbnormalAndDirectBtnVisibility(); orderItem.SetAbnormalAndDirectBtnVisibility();
@@ -23,6 +23,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// 空/Null 表示全部店铺(服务层会取全部店铺的 ErpShopId)。 /// 空/Null 表示全部店铺(服务层会取全部店铺的 ErpShopId)。
/// </summary> /// </summary>
public List<string> ShopIds { get; set; } public List<string> ShopIds { get; set; }
/// <summary>
/// 是否统计快递费用
/// </summary>
public bool StatPackages { get; set; }
} }
/// <summary> /// <summary>
@@ -111,6 +115,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// 被拒绝金额(分) /// 被拒绝金额(分)
/// </summary> /// </summary>
public long RejectedRefund { get; set; } public long RejectedRefund { get; set; }
/// <summary>
/// 包裹费用
/// </summary>
public long PackageAmount { get; set; }
} }
/// <summary> /// <summary>
@@ -199,6 +207,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// </summary> /// </summary>
public int UnrefundedAmount { get; set; } public int UnrefundedAmount { get; set; }
public long PackageAmount { get; set; }
/// <summary> /// <summary>
/// 买手订单信息(一个订单号对应多个买手订单) /// 买手订单信息(一个订单号对应多个买手订单)
/// </summary> /// </summary>
@@ -288,6 +297,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
public decimal BuyerRefundSuccessedAmount { get; set; } public decimal BuyerRefundSuccessedAmount { get; set; }
/// <summary>买手号剩余退款金额(尚未成功退款的金额,元)</summary> /// <summary>买手号剩余退款金额(尚未成功退款的金额,元)</summary>
public decimal BuyerRefundRemainingAmount => BuyerRefundAmount - BuyerRefundSuccessedAmount; public decimal BuyerRefundRemainingAmount => BuyerRefundAmount - BuyerRefundSuccessedAmount;
/// <summary>
/// 包裹费用
/// </summary>
public decimal PackageAmount { get; set; }
} }
/// <summary> /// <summary>
@@ -355,6 +368,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// <summary>平均利润率(利润 / 采购金额,百分数,如 12.34 表示 12.34%)</summary> /// <summary>平均利润率(利润 / 采购金额,百分数,如 12.34 表示 12.34%)</summary>
public decimal AverageProfitRate { get; set; } public decimal AverageProfitRate { get; set; }
/// <summary>
/// 包裹费用
/// </summary>
public decimal PackageAmount { get; set; }
} }
/// <summary> /// <summary>
@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels" xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels"
xmlns:wpf="WPFCommon"
d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel, d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,
IsDesignTimeCreatable=True}" IsDesignTimeCreatable=True}"
mc:Ignorable="d"> mc:Ignorable="d">
@@ -48,9 +49,9 @@
Width="110" Width="110"
Height="32" Height="32"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
BorderThickness="1"
DisplayMemberPath="Text" DisplayMemberPath="Text"
IsReadOnly="True" IsReadOnly="True"
BorderThickness="1"
ItemsSource="{Binding TimeRangeOptions}" ItemsSource="{Binding TimeRangeOptions}"
SelectedItem="{Binding SelectedTimeRange, Mode=TwoWay}" SelectedItem="{Binding SelectedTimeRange, Mode=TwoWay}"
Style="{StaticResource RoundedComboBox}" /> Style="{StaticResource RoundedComboBox}" />
@@ -60,9 +61,10 @@
FontSize="14" FontSize="14"
Foreground="#666666" Foreground="#666666"
Text="日期" /> Text="日期" />
<DatePicker BorderBrush="{StaticResource pageColorBrush}" <DatePicker
Height="32" Height="32"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
BorderBrush="{StaticResource pageColorBrush}"
SelectedDate="{Binding StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> SelectedDate="{Binding StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock <TextBlock
Margin="6,0" Margin="6,0"
@@ -70,9 +72,10 @@
FontSize="14" FontSize="14"
Foreground="#666666" Foreground="#666666"
Text="~" /> Text="~" />
<DatePicker BorderBrush="{StaticResource pageColorBrush}" <DatePicker
Height="32" Height="32"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
BorderBrush="{StaticResource pageColorBrush}"
SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock <TextBlock
Margin="14,0,6,0" Margin="14,0,6,0"
@@ -95,6 +98,14 @@
ItemsSource="{Binding ShopOptions}" ItemsSource="{Binding ShopOptions}"
SelectedItem="{Binding SelectedShop, Mode=TwoWay}" SelectedItem="{Binding SelectedShop, Mode=TwoWay}"
Style="{StaticResource BaseComboBoxStyle}" />--> Style="{StaticResource BaseComboBoxStyle}" />-->
<wpf:TitleContent
Title="去除快递费"
Margin="10,0,0,0"
VerticalContentAlignment="Center"
Placement="Left"
TitleVerticalAlignment="Center">
<CheckBox IsChecked="{Binding StatPackages}" Style="{StaticResource ToggleSwitch}" />
</wpf:TitleContent>
<Button <Button
Height="32" Height="32"
Margin="18,0,0,0" Margin="18,0,0,0"
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase)); decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
decimal buyerRefundAmount = ToYuan(list.Sum(a => a.TotalRefund)); decimal buyerRefundAmount = ToYuan(list.Sum(a => a.TotalRefund));
decimal buyerRefundSuccessedAmount = ToYuan(list.Sum(a => a.DoneRefund)); decimal buyerRefundSuccessedAmount = ToYuan(list.Sum(a => a.DoneRefund));
decimal packageAmount = ToYuan(list.Sum(a => a.PackageAmount));
int validOrderCount = list.Sum(a => a.OrderCount); // 新接口 OrderCount 不含退款订单 int validOrderCount = list.Sum(a => a.OrderCount); // 新接口 OrderCount 不含退款订单
int refundOrderCount = list.Sum(a => a.RefundOrderCount); int refundOrderCount = list.Sum(a => a.RefundOrderCount);
int totalOrderCount = validOrderCount + refundOrderCount; int totalOrderCount = validOrderCount + refundOrderCount;
@@ -128,6 +128,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
BuyerPaymentAmount = buyerPaymentAmount, BuyerPaymentAmount = buyerPaymentAmount,
BuyerRefundAmount = buyerRefundAmount, BuyerRefundAmount = buyerRefundAmount,
BuyerRefundSuccessedAmount = buyerRefundSuccessedAmount, BuyerRefundSuccessedAmount = buyerRefundSuccessedAmount,
PackageAmount = packageAmount
}; };
} }
@@ -248,7 +249,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
decimal profit = ToYuan(list.Sum(a => a.ProfitAmount)); decimal profit = ToYuan(list.Sum(a => a.ProfitAmount));
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase)); decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
int orderCount = list.Sum(a => a.OrderCount); int orderCount = list.Sum(a => a.OrderCount);
decimal packageAmount = ToYuan(list.Sum(a => a.PackageAmount));
return new ShopStatisticsItem return new ShopStatisticsItem
{ {
ShopName = ResolveShopName(shopId), ShopName = ResolveShopName(shopId),
@@ -260,7 +261,8 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)), PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)),
Commission = 0m, // 新接口无“达人佣金”字段,保留占位 Commission = 0m, // 新接口无“达人佣金”字段,保留占位
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount, AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount,
AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m,
PackageAmount = packageAmount
}; };
} }
@@ -385,7 +387,13 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
// 顺序请求:签名中的 time/code 由当前时间生成,并发请求有被判重复签名的风险。 // 顺序请求:签名中的 time/code 由当前时间生成,并发请求有被判重复签名的风险。
var summaryStats = await RequestStatsAsync(query, ShopStatsGroupType.Summary); var summaryStats = await RequestStatsAsync(query, ShopStatsGroupType.Summary);
var trend = await RequestTrendAsync(query); var trend = await RequestTrendAsync(query);
if (query.StatPackages)
{
foreach (var item in summaryStats)
{
item.ProfitAmount -= item.PackageAmount;
}
}
return new ShopRevenueStatisticsResult return new ShopRevenueStatisticsResult
{ {
Summary = ShopStatsAggregator.GetSummary(summaryStats), Summary = ShopStatsAggregator.GetSummary(summaryStats),
@@ -399,7 +407,13 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
{ {
// 按天/周/月粒度取数;接口不返回整段汇总,卡片由返回的周期记录在客户端合计 // 按天/周/月粒度取数;接口不返回整段汇总,卡片由返回的周期记录在客户端合计
var stats = await RequestStatsAsync(query, ToGroupType(periodType)); var stats = await RequestStatsAsync(query, ToGroupType(periodType));
if (query.StatPackages)
{
foreach (var item in stats)
{
item.ProfitAmount -= item.PackageAmount;
}
}
return new ShopPeriodStatisticsResult return new ShopPeriodStatisticsResult
{ {
Summary = ShopStatsAggregator.GetSummary(stats), Summary = ShopStatsAggregator.GetSummary(stats),
@@ -274,11 +274,13 @@
</TabItem> </TabItem>
</TabControl> </TabControl>
<!-- helper --> <!-- helper -->
<Border
<WrapPanel
Margin="0,20,30,0" Margin="0,20,30,0"
Padding="10"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top">
<Border
Padding="10"
Background="{StaticResource pageColorBrush}" Background="{StaticResource pageColorBrush}"
BorderThickness="1" BorderThickness="1"
Cursor="Hand" Cursor="Hand"
@@ -297,7 +299,7 @@
Text="利润计算逻辑" /> Text="利润计算逻辑" />
</WrapPanel> </WrapPanel>
</Border> </Border>
</WrapPanel>
<!-- Popup 弹出层 --> <!-- Popup 弹出层 -->
<Popup <Popup
x:Name="InfoPopup" x:Name="InfoPopup"
@@ -157,7 +157,11 @@
Binding="{Binding ProfitAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}" Binding="{Binding ProfitAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}"
ElementStyle="{StaticResource CenterCellTextStyle}" ElementStyle="{StaticResource CenterCellTextStyle}"
Header="利润" /> Header="利润" />
<DataGridTextColumn
Width="*"
Binding="{Binding PackageAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}"
ElementStyle="{StaticResource CenterCellTextStyle}"
Header="快递费" />
<!-- 买手订单:一笔买手订单占一行,不合并 --> <!-- 买手订单:一笔买手订单占一行,不合并 -->
<DataGridTextColumn <DataGridTextColumn
Width="1.6*" Width="1.6*"
@@ -166,7 +166,10 @@ class ShopOrderDetailRow : BindableBaseEx
/// 利润 /// 利润
/// </summary> /// </summary>
public long ProfitAmount { get; set; } public long ProfitAmount { get; set; }
/// <summary>
/// 包裹费用
/// </summary>
public long PackageAmount { get; set; }
/// <summary> /// <summary>
/// 平台佣金 /// 平台佣金
/// </summary> /// </summary>
@@ -246,6 +249,7 @@ class ShopOrderDetailRow : BindableBaseEx
OrderPrice = item.OrderPrice, OrderPrice = item.OrderPrice,
OrderRefundAmount = item.OrderRefundAmount, OrderRefundAmount = item.OrderRefundAmount,
ProfitAmount = item.ProfitAmount, ProfitAmount = item.ProfitAmount,
PackageAmount = item.PackageAmount,
PlatformFee = item.PlatformFee, PlatformFee = item.PlatformFee,
OutAmount = item.OutAmount, OutAmount = item.OutAmount,
UnrefundedAmount = item.UnrefundedAmount, UnrefundedAmount = item.UnrefundedAmount,
@@ -411,7 +415,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
bool includeRemark = _detailType == ShopOrderDetailType.BuyerUnrefunded; bool includeRemark = _detailType == ShopOrderDetailType.BuyerUnrefunded;
// 表头 // 表头
List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润", "买手单号", "外采金额", "买手退款", "退款状态"]; List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润","快递费", "买手单号", "外采金额", "买手退款", "退款状态"];
if (includeRemark) if (includeRemark)
headers.Add("备注"); headers.Add("备注");
sb.AppendLine(string.Join("\t", headers)); sb.AppendLine(string.Join("\t", headers));
@@ -428,6 +432,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
(item.OrderRefundAmount / 100m).ToString("0.00"), (item.OrderRefundAmount / 100m).ToString("0.00"),
(item.PlatformFee / 100m).ToString("0.00"), (item.PlatformFee / 100m).ToString("0.00"),
(item.ProfitAmount / 100m).ToString("0.00"), (item.ProfitAmount / 100m).ToString("0.00"),
(item.PackageAmount / 100m).ToString("0.00"),
CsvEscape(item.OutOrderSn), CsvEscape(item.OutOrderSn),
(item.BuyerOutAmount / 100m).ToString("0.00"), (item.BuyerOutAmount / 100m).ToString("0.00"),
(item.BuyerRefundAmount / 100m).ToString("0.00"), (item.BuyerRefundAmount / 100m).ToString("0.00"),
@@ -177,7 +177,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
#endregion #endregion
#region 查询条件 #region 查询条件
public bool StatPackages
{
get { return this.GetValue(x => x.StatPackages); }
set { this.SetValue(x => x.StatPackages, value); }
}
/// <summary>时间范围选项</summary> /// <summary>时间范围选项</summary>
public ObservableCollection<TimeRangeOption> TimeRangeOptions { get; } public ObservableCollection<TimeRangeOption> TimeRangeOptions { get; }
@@ -541,6 +545,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
StartDate = StartDate, StartDate = StartDate,
EndDate = EndDate, EndDate = EndDate,
ShopIds = BuildSelectedShopIds(), ShopIds = BuildSelectedShopIds(),
StatPackages = StatPackages
}; };
} }
@@ -61,6 +61,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
InitializeAsync(); InitializeAsync();
} }
public bool StatPackages
{
get { return this.GetValue(x => x.StatPackages); }
set { this.SetValue(x => x.StatPackages, value); }
}
#region 查询条件 #region 查询条件
@@ -288,6 +293,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
StartDate = StartDate, StartDate = StartDate,
EndDate = EndDate, EndDate = EndDate,
ShopIds = BuildSelectedShopIds(), ShopIds = BuildSelectedShopIds(),
StatPackages = StatPackages,
}; };
} }
+1 -1
View File
@@ -347,7 +347,7 @@ namespace _29WxOrderWpf
foreach (var order in orders) foreach (var order in orders)
{ {
// 更新代发管理情况 // 更新代发管理情况
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
orderItem.UpdateOrderItemBuyButton(); orderItem.UpdateOrderItemBuyButton();
//Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); })); //Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
} }
+2 -2
View File
@@ -7,11 +7,11 @@ using System.Windows;
// 有关程序集的一般信息由以下 // 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改 // 控制。更改这些特性值可修改
// 与程序集关联的信息。 // 与程序集关联的信息。
[assembly: AssemblyTitle("29供应连-微信小店订单管理")] [assembly: AssemblyTitle("29供应链-微信小店订单管理")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("29供应连-微信小店订单管理")] [assembly: AssemblyProduct("29供应链-微信小店订单管理")]
[assembly: AssemblyCopyright("Copyright © 2026")] [assembly: AssemblyCopyright("Copyright © 2026")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
+3 -2
View File
@@ -45,9 +45,10 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 100) if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 100)
{ {
giftType = GiftType._160;
giftAmount = 1.6m; giftAmount = 1.6m;
} }
decimal amount = giftAmount + BaseClass.OemGiftAmount; decimal amount = giftAmount + BaseClass.OemGiftAmount + BaseClass.ParentOemGiftAmount;
string province = item.province_name; string province = item.province_name;
@@ -80,7 +81,7 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
// amount = (int)(amount * 100), // amount = (int)(amount * 100),
// oemAmount = (int)(BaseClass.OemGiftAmount * 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; return ret;
+19 -2
View File
@@ -1,10 +1,12 @@
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;
using AllBase.Model.Config; using AllBase.Model.Config;
using AllBase.Model.DBModel; using AllBase.Model.DBModel;
using NaiBa.Util; using NaiBa.Util;
using NaiBa.Util.Extension;
using NaiBa.Util.Helper; using NaiBa.Util.Helper;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System; using System;
@@ -49,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();
@@ -65,6 +67,21 @@ namespace _29WxOrderWpf
// 更新下每单扣费金额 // 更新下每单扣费金额
BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order")); 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.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");
try
{
await UserLogin.GetUserOemAmount(16);
await UserLogin.GetUserOemAmount(20);
await UserLogin.GetUserOemAmount(26);
}
catch (Exception ex)
{
BaseMsgWindow.ShowError("更新账户余额失败 " + ex.Message);
}
} }
} }
} }
@@ -236,7 +236,7 @@ public class BuyMapSkuViewModel : PropertyNotifyObject
{ {
if (order.IsWaitBuy) 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) || 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) || (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)); 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]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
JObject body = new JObject(); JObject body = new JObject();
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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["packType"] = "2";
body["batchId"] = TransitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1); body["batchId"] = TransitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
@@ -139,8 +142,9 @@ namespace _29WxOrderWpf.ViewModels
body["logisticsExpressCode"] = TransitOrder.express_2_waybill; body["logisticsExpressCode"] = TransitOrder.express_2_waybill;
} }
body["accountUser"] = BaseClass.UserName; body["userName"] = BaseClass.UserName; // 软件端用户名
body["purchaserNote"] = purchaserNote.ParseToString(); // 采购人备注 body["accountUser"] = BaseClass.UserName; // 后续改为买手昵称,滞留补发填空
body["purchaserNote"] = BaseClass.UserName + "-" + BaseClass.NickName; //purchaserNote.ParseToString(); // 采购人备注
body["orderPlatformCode"] = "WEISHOP"; body["orderPlatformCode"] = "WEISHOP";
var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extra-packages/save"; var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extra-packages/save";
@@ -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;
@@ -44,7 +45,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
if (!string.IsNullOrEmpty(BaseClass.ProgramName)) if (!string.IsNullOrEmpty(BaseClass.ProgramName))
{ {
lblAppName.Content = BaseClass.ProgramName; lblAppName.Content = BaseClass.ProgramName;
MainWindow.Instance.lblAppName.Content = lblAppName.Content; MainWindow.Instance.lblAppName.Content = BaseClass.ProgramName.Contains("-微信小店订单管理") ? BaseClass.ProgramName : BaseClass.ProgramName + "-微信小店订单管理";
} }
this.Title = "用户登录"; this.Title = "用户登录";
@@ -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();
} }
@@ -71,7 +71,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
// 获取额外包裹对应的发货包裹或者发货包裹本身 // 获取额外包裹对应的发货包裹或者发货包裹本身
var _transitOrder = OrderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == ExtraPackage?.order_code); var _transitOrder = OrderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == ExtraPackage?.order_code);
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == ExtraPackage?.platform)?.TransName; this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == _transitOrder?.platform)?.TransName;
this.txtExpressName.Text = string.IsNullOrWhiteSpace(ExtraPackage.real_logistics_code) ? ExtraPackage.logistics_code : ExtraPackage?.real_logistics_code; this.txtExpressName.Text = string.IsNullOrWhiteSpace(ExtraPackage.real_logistics_code) ? ExtraPackage.logistics_code : ExtraPackage?.real_logistics_code;
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(ExtraPackage?.real_logistics_express_code) ? ExtraPackage?.logistics_express_code : ExtraPackage?.real_logistics_express_code; this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(ExtraPackage?.real_logistics_express_code) ? ExtraPackage?.logistics_express_code : ExtraPackage?.real_logistics_express_code;
@@ -102,7 +102,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id); var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null) 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) if (orderItemTmp != null)
OrderItem = orderItemTmp; OrderItem = orderItemTmp;
} }
@@ -166,7 +166,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id); var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null) 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) if (orderItemTmp != null)
OrderItem = orderItemTmp; OrderItem = orderItemTmp;
} }
@@ -223,7 +223,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
JObject data = new JObject(); JObject data = new JObject();
data["orderNo"] = OrderItem.order_id; data["orderNo"] = OrderItem.order_id;
data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */ data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage?.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */
data["refundProvince"] = txtProvince.Text.Trim(); data["refundProvince"] = txtProvince.Text.Trim();
data["refundCity"] = txtCity.Text.Trim(); data["refundCity"] = txtCity.Text.Trim();
data["refundCounty"] = txtCounty.Text.Trim(); data["refundCounty"] = txtCounty.Text.Trim();
@@ -241,24 +241,25 @@ namespace _29WxOrderWpf.Windows.OrderWindows
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛) basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
data["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString(); data["parentOemId"] = BaseClass.ParentOemId;
data["postage"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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"; var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage";
var getTransitAfterSaleStr = JsonHelper.SerializeObject(data); var getTransitAfterSaleStr = JsonHelper.SerializeObject(data);
var getTransitAfterSaleRst = HttpResponseWXBLL.e57PostResponse(getTransitAfterSaleUrl, getTransitAfterSaleStr, ""); var getTransitAfterSaleRst = await HttpResponseWXBLL.e57PostResponseAsync(getTransitAfterSaleUrl, getTransitAfterSaleStr);
if (!getTransitAfterSaleRst.ParseToString().Contains("<code>200</code>") && !getTransitAfterSaleRst.ParseToString().Contains("<code>0</code>")) if (!getTransitAfterSaleRst.ParseToString().Contains("\"code\":0") && !getTransitAfterSaleRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg"); string msg = BaseRegex.GetStringJsonByRegs(ref getTransitAfterSaleRst, getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty())
msg = getTransitAfterSaleRst;
BaseMsgWindow.ShowError("拦截退货包裹添加失败,服务端返回 " + msg, "", this); BaseMsgWindow.ShowError("拦截退货包裹添加失败,服务端返回 " + msg, "", this);
} }
else else
{ {
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult> //<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); }); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
//MainWindow.Instance.orderListCtrl.FilterOrders(); //MainWindow.Instance.orderListCtrl.FilterOrders();
StartUp.UpdateBalance(); StartUp.UpdateBalance();
BaseMsgWindow.ShowInfo("添加拦截退货包裹成功", "", this); BaseMsgWindow.ShowInfo("添加拦截退货包裹成功", "", this);
@@ -130,7 +130,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
} }
} }
private void btnAdd_Click(object sender, RoutedEventArgs e) private async void btnAdd_Click(object sender, RoutedEventArgs e)
{ {
if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
{ {
@@ -184,8 +184,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛) basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString(); jObj["parentOemId"] = BaseClass.ParentOemId;
jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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(); JObject jItemObj = new JObject();
jItemObj["spuCode"] = OrderItem.product_id.ParseToString(); jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
@@ -199,7 +202,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj); (jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null) if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
{ {
@@ -216,13 +219,13 @@ namespace _29WxOrderWpf.Windows.OrderWindows
} }
} }
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code; var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode)) if (string.IsNullOrEmpty(orderCode))
{ {
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败"); BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败");
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder"; var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
@@ -239,17 +242,17 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (msg.IsNullOrEmpty()) if (msg.IsNullOrEmpty())
msg = createReturnOrderRst; msg = createReturnOrderRst;
BaseMsgWindow.ShowError("中转仓退货订单创建失败,服务端返回 " + msg); BaseMsgWindow.ShowError("中转仓退货订单创建失败,服务端返回 " + msg);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
StartUp.UpdateBalance(); StartUp.UpdateBalance();
BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this); BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this);
this.Close(); this.Close();
} }
public static void AddReturnOrder(oms_wei_order_item_info OrderItem) public static async Task AddReturnOrder(oms_wei_order_item_info OrderItem)
{ {
// 订单不存在或已作废的,直接返回 // 订单不存在或已作废的,直接返回
if (OrderItem == null || OrderItem.ItemRefund == null) if (OrderItem == null || OrderItem.ItemRefund == null)
@@ -310,8 +313,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛) basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString(); jObj["parentOemId"] = BaseClass.ParentOemId;
jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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(); JObject jItemObj = new JObject();
jItemObj["spuCode"] = OrderItem.product_id.ParseToString(); jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
@@ -325,7 +331,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj); (jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
if (OrderItem.DistribReturnOrderInfo == null) if (OrderItem.DistribReturnOrderInfo == null)
{ {
@@ -342,13 +348,13 @@ namespace _29WxOrderWpf.Windows.OrderWindows
} }
} }
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code; var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode)) if (string.IsNullOrEmpty(orderCode))
{ {
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败", "Error", 5); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败", "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder"; var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
@@ -364,12 +370,12 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (msg.IsNullOrEmpty()) if (msg.IsNullOrEmpty())
msg = createReturnOrderRst; msg = createReturnOrderRst;
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); //MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
StartUp.UpdateBalance(); StartUp.UpdateBalance();
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);
+20 -3
View File
@@ -22,6 +22,8 @@ namespace AllBase
#region oem贴牌参数 #region oem贴牌参数
public static string OemId { get; set; } = ""; public static string OemId { get; set; } = "";
public static string OemName { 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 bool IsOemOwner { get; set; } = false;
public static string AgentName { get; set; } = ""; public static string AgentName { get; set; } = "";
public static string AgentCode { get; set; } = ""; public static string AgentCode { get; set; } = "";
@@ -31,13 +33,17 @@ namespace AllBase
/// 礼品单oem额外价格 /// 礼品单oem额外价格
/// </summary> /// </summary>
public static decimal OemGiftAmount { get; set; } = 0; public static decimal OemGiftAmount { get; set; } = 0;
/// <summary>
/// 礼品单一级代理oem额外价格
/// </summary>
public static decimal ParentOemGiftAmount { get; set; } = 0;
#endregion #endregion
/// <summary> /// <summary>
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 386; public static int VersionCount = 397;
//public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; //public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string ServerUrl public static string ServerUrl
@@ -213,10 +219,20 @@ namespace AllBase
public static int ShopPointsPerMonth { get; set; } = 30; public static int ShopPointsPerMonth { get; set; } = 30;
public static decimal RechargeAmountTotal { get; set; } = 0; public static decimal RechargeAmountTotal { get; set; } = 0;
public static decimal Balance { get; set; } = 0; public static decimal Balance { get; set; } = 0;
/// <summary>
/// 发货每笔费用
/// </summary>
public static decimal PostagePerOrder { get; set; } = 2.2m; 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 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 int AlimamaPageCount = 0;
public static bool CloudTitle = false; public static bool CloudTitle = false;
public static bool CloudBrand = false; public static bool CloudBrand = false;
@@ -604,6 +620,7 @@ namespace AllBase
public static string PassWordBak { get; set; } public static string PassWordBak { get; set; }
public static string Mobile { get; set; } public static string Mobile { get; set; }
public static bool AllowTraditionalBuyAddress { get; set; }
public static string ParentAuthority { get; set; } public static string ParentAuthority { get; set; }
public static string ForbiddenPage { get; set; } public static string ForbiddenPage { get; set; }
public static string UserAuthority { get; set; } public static string UserAuthority { get; set; }
@@ -72,7 +72,7 @@ XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园 XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头 XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司(仓库二楼) 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号楼 XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼
XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋 XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋"; XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋";
+53 -53
View File
@@ -57,36 +57,36 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.OrderBuyTypeColor, value); } 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 ObservableCollection<oms_wei_order_item_info> OrderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
public oms_wei_order_item_info orderItem public oms_wei_order_item_info OrderItem
{ {
get { return this.GetValue(x => x.orderItem); } get { return this.GetValue(x => x.OrderItem); }
set { this.SetValue(x => x.orderItem, value); } 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); } get { return this.GetValue(x => x.OrderItem2); }
set { this.SetValue(x => x.orderItem2, value); } 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); } get { return this.GetValue(x => x.OrderItem3); }
set { this.SetValue(x => x.orderItem3, value); } 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); } get { return this.GetValue(x => x.OrderItem4); }
set { this.SetValue(x => x.orderItem4, value); } 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); } get { return this.GetValue(x => x.OrderItem5); }
set { this.SetValue(x => x.orderItem5, value); } 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> /// <summary>
/// 待采购 /// 待采购
@@ -255,14 +255,14 @@ namespace AllBase.Model.DBModel
} }
void SetDeliveryDeadlineStatusStr() void SetDeliveryDeadlineStatusStr()
{ {
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr))) if (this.RefundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
DeliveryDeadlineStatusStr = "退款中"; DeliveryDeadlineStatusStr = "退款中";
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成")) else if (this.RefundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
DeliveryDeadlineStatusStr = "退款完成"; DeliveryDeadlineStatusStr = "退款完成";
// 用户取消申请 // 用户取消申请
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) && else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty())) this.RefundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr; DeliveryDeadlineStatusStr = this.RefundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
else if (this.status == 20 || this.status == 21) else if (this.status == 20 || this.status == 21)
{ {
DeliveryDeadlineStatusStr = "剩余"; DeliveryDeadlineStatusStr = "剩余";
@@ -755,17 +755,17 @@ namespace AllBase.Model.DBModel
{ {
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString()); 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 = "云改直"; OrderBuyType = "云改直";
OrderBuyTypeColor = GlobalConfig.PurpleBrush190; OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
} }
else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发")) else if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
{ {
OrderBuyType = "直发"; OrderBuyType = "直发";
OrderBuyTypeColor = GlobalConfig.RedTextBrush205; OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
} }
else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null)) else if (this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{ {
OrderBuyType = "云仓"; OrderBuyType = "云仓";
OrderBuyTypeColor = GlobalConfig.GreenTextBrush; OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
@@ -773,11 +773,11 @@ namespace AllBase.Model.DBModel
else else
OrderBuyType = ""; OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND")) if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款"; this.RefundTypeStr = "仅退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN")) else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "退货退款"; 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 = "仅退款/退货退款"; this.RefundTypeStr = "仅退款/退货退款";
IsWaitBuy = GetIsWaitBuy(); IsWaitBuy = GetIsWaitBuy();
@@ -795,7 +795,7 @@ namespace AllBase.Model.DBModel
else else
IsShowChangeWaybillBtn = true; IsShowChangeWaybillBtn = true;
if (IsWaitBuy || this.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null)) if (IsWaitBuy || this.OrderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
IsShowTransitExtraPackagesBtn = false; IsShowTransitExtraPackagesBtn = false;
else else
IsShowTransitExtraPackagesBtn = true; IsShowTransitExtraPackagesBtn = true;
@@ -807,12 +807,12 @@ namespace AllBase.Model.DBModel
SetShipDoneTimeStr(); SetShipDoneTimeStr();
SetColorBrush(); SetColorBrush();
orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed }; 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 }; 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 }; 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 }; 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 }; OrderItem5 = OrderItems.Count > 4 ? OrderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : ""; OrderDiffItemCountStr = OrderItems.Count > 1 ? "该订单共有 " + OrderItems.Count + " 个不同的商品规格" : "";
} }
public void SetColorBrush() public void SetColorBrush()
@@ -835,13 +835,13 @@ namespace AllBase.Model.DBModel
{ {
if (status != 20 && status != 21) if (status != 20 && status != 21)
return false; return false;
if (refundItems?.Any(r => r.IsRefund) == true) if (RefundItems?.Any(r => r.IsRefund) == true)
return false; return false;
// 子表有售后信息(可能更新不及时) // 子表有售后信息(可能更新不及时)
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false; return false;
// 中转仓有拍单信息 // 中转仓有拍单信息
if (orderItems.All(oi => oi.ItemTransitOrder != null)) if (OrderItems.All(oi => oi.ItemTransitOrder != null))
return false; return false;
// 采购状态为已采购 // 采购状态为已采购
if (purchase_status != 0) if (purchase_status != 0)
@@ -865,16 +865,16 @@ namespace AllBase.Model.DBModel
if (status != 20 && status != 21) if (status != 20 && status != 21)
return false; return false;
if (refundItems?.Any(r => r.IsRefund) == true) if (RefundItems?.Any(r => r.IsRefund) == true)
return false; return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false; return false;
// 礼物单已发货 // 礼物单已发货
if (gift_order_status == 1 || gift_order_status == 2) if (gift_order_status == 1 || gift_order_status == 2)
return false; return false;
// 店铺未发货,外采已采购 // 店铺未发货,外采已采购
// out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉 // 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 == "退款成功")) (string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
return false; return false;
return true; return true;
@@ -882,9 +882,9 @@ namespace AllBase.Model.DBModel
private bool GetIsWaitReceive() private bool GetIsWaitReceive()
{ {
if (refundItems?.Any(r => r.IsRefund) == true) if (RefundItems?.Any(r => r.IsRefund) == true)
return false; return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false; return false;
if (!(status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2)) if (!(status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2))
return false; return false;
@@ -903,23 +903,23 @@ namespace AllBase.Model.DBModel
return false; return false;
// 如果有售后,直接作为售后单处理 // 如果有售后,直接作为售后单处理
if (orderItems.All(oi => oi.refund_status > 1)) if (OrderItems.All(oi => oi.refund_status > 1))
return false; 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; return false;
if (gift_order_status == 1 || gift_order_status == 2) if (gift_order_status == 1 || gift_order_status == 2)
return false; return false;
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty())) if (OrderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
return true; 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; 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?.raw_message).ParseToString().Contains("无法调用")) &&
oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)) oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
return true; return true;
@@ -929,7 +929,7 @@ namespace AllBase.Model.DBModel
public bool GetIsRefund() public bool GetIsRefund()
{ {
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); // 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; return false;
if (GetIsEmergency()) if (GetIsEmergency())
return false; return false;
@@ -939,16 +939,16 @@ namespace AllBase.Model.DBModel
public bool GetIsEmergency() 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; 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; 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; 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 => !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 == 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);
} }
} }
} }
@@ -52,6 +52,19 @@ namespace AllBase.Model.DBModel
VoidPackageTypeStr = ""; VoidPackageTypeStr = "";
if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed; if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed;
} }
//if (value?.oms_wei_external_procurement_log_info is oms_wei_external_procurement_log_info transitInfo)
//{
// if (this.refund_status == 1 && transitInfo.refund_status.ParseToString().Contains("退款成功") && !TransitPackageLatest.WarehouseStatus.ParseToString().Contains("取号异常(超区)"))
// {
// CanUseTraditionalAddress = true;
// }
// else
// {
// CanUseTraditionalAddress = false;
// }
//}
} }
} }
@@ -113,6 +126,15 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.VoidPackageTypeStr, value); } set { this.SetValue(x => x.VoidPackageTypeStr, value); }
} }
/// <summary>
/// 拍单时是否可以使用繁体字地址
/// </summary>
//public bool CanUseTraditionalAddress
//{
// get { return this.GetValue(x => x.CanUseTraditionalAddress); }
// set { this.SetValue(x => x.CanUseTraditionalAddress, value); }
//}
///// <summary> ///// <summary>
///// 订单对应店铺 ///// 订单对应店铺
///// </summary> ///// </summary>
@@ -284,10 +306,10 @@ namespace AllBase.Model.DBModel
{ {
} }
if (ItemOrder?.refundItems?.Count == 1) if (ItemOrder?.RefundItems?.Count == 1)
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(); ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault();
else 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") if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
this.RefundResultStr = ""; this.RefundResultStr = "";
@@ -1306,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"); } //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"); 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"); } //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"); PurchasePriceStr = "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00");
@@ -1339,8 +1361,8 @@ namespace AllBase.Model.DBModel
OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值 //ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / 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; 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() - 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(); predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
@@ -1524,6 +1546,14 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); } set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
} }
/// <summary> /// <summary>
/// 异常额外包裹按钮可见性
/// </summary>
public Visibility BtnAbnormalOrderExtraBuyVisibility
{
get { return this.GetValue(x => x.BtnAbnormalOrderExtraBuyVisibility); }
set { this.SetValue(x => x.BtnAbnormalOrderExtraBuyVisibility, value); }
}
/// <summary>
/// 直发按钮可见条件 /// 直发按钮可见条件
/// </summary> /// </summary>
public Visibility BtnDirectBuyOrderVisibility public Visibility BtnDirectBuyOrderVisibility
@@ -1531,10 +1561,16 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); } get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); }
set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); } set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); }
} }
public bool? _itemOrderIsAbnormal { get; set; } = false;
public bool? _itemOrderIsWaitBuy { get; set; } = false;
public void SetAbnormalAndDirectBtnVisibility() public void SetAbnormalAndDirectBtnVisibility()
{ {
bool? _itemOrderIsAbnormal = ItemOrder?.GetIsAbnormal(); _itemOrderIsAbnormal = ItemOrder?.GetIsAbnormal();
bool? _itemOrderIsWaitBuy = ItemOrder?.GetIsWaitBuy(); if (ItemOrder != null)
ItemOrder.IsAbnormal = _itemOrderIsAbnormal == true;
_itemOrderIsWaitBuy = ItemOrder?.GetIsWaitBuy();
if (ItemOrder != null)
ItemOrder.IsWaitBuy = _itemOrderIsWaitBuy == true;
// 买手秒退异常重拍 // 买手秒退异常重拍
var _btnAbnormalOrderRebuyVisibility = Visibility.Visible; var _btnAbnormalOrderRebuyVisibility = Visibility.Visible;
@@ -1555,6 +1591,8 @@ namespace AllBase.Model.DBModel
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed; _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility; BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility;
BtnAbnormalOrderExtraBuyVisibility = Visibility.Collapsed;
// 直拍按钮 // 直拍按钮
BtnDirectBuyOrderVisibility = Visibility.Collapsed; BtnDirectBuyOrderVisibility = Visibility.Collapsed;
if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30) if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30)
@@ -1817,13 +1855,13 @@ namespace AllBase.Model.DBModel
/// <summary> 初始化物流明细信息 </summary> /// <summary> 初始化物流明细信息 </summary>
public void SetEWaybillInfo() public void SetEWaybillInfo()
{ {
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(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); LatestTransitEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
else else
LatestTransitEWaybill = null; LatestTransitEWaybill = null;
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(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); LatestDirectEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
else else
LatestDirectEWaybill = null; LatestDirectEWaybill = null;
} }
@@ -1914,7 +1952,7 @@ namespace AllBase.Model.DBModel
} }
/// <summary> /// <summary>
/// 判断中转仓订单是否可以异常重拍 /// 判断中转仓订单是否可以异常重拍(拍单时用,初始化数据时候返回的数据是错的)
/// </summary> /// </summary>
/// <param name="order_item"></param> /// <param name="order_item"></param>
/// <returns></returns> /// <returns></returns>
@@ -194,12 +194,13 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */ Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 && transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ? !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */ Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
transitDetail.ExtraPackagesBtnVisibility = (transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) && transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ? !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1)) ||
OrderItem._itemOrderIsAbnormal == true ?
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */ Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
@@ -237,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,
@@ -261,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,
@@ -309,7 +312,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */ //transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
transitDetail.VoidPackageBtnVisibility = (transitAftersaleOrder.warehouse_status == 0 || transitAftersaleOrder.warehouse_status == 1 || transitAftersaleOrder.warehouse_status == 3) && transitDetail.VoidPackageBtnVisibility = /*(transitAftersaleOrder.warehouse_status == null || transitAftersaleOrder.warehouse_status == 0 || transitAftersaleOrder.warehouse_status == 1 || transitAftersaleOrder.warehouse_status == 3) &&*/
transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */ transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; //transitDetail.VoidPackageBtnVisibility = Visibility.Visible;
@@ -449,13 +452,13 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
// transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ? // transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */ // Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
transitDetail.VoidPackageBtnVisibility = !(transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) && transitDetail.VoidPackageBtnVisibility = (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */ transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
// 额外包裹在仓库只能作废,出仓以后才能拦截退回 // 额外包裹在仓库只能作废,出仓以后才能拦截退回
//transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) && //transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
// transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ? // transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */ // Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitExtraOrder.warehouse_status == 2 && transitDetail.InterceptPackageBtnVisibility = (transitExtraOrder.warehouse_status == 2 || transitExtraOrder.outbound_time > DateTime.MinValue || !transitExtraOrder.real_logistics_express_code.IsNullOrEmpty()) &&
transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ? transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */ Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
+25 -9
View File
@@ -69,6 +69,8 @@ namespace AllBase.Model.DBModel
public enum EnumOrderPaymentType public enum EnumOrderPaymentType
{ {
//变动类型,1:充值,2:采购花费,3:产品退款到账,4:运费退款到账,5:采购收款,6:产品退款扣除,7:运费退款扣除, 16:礼物单话费,20:中转仓扣费支出,23:中转仓退款收入,24:中转仓超重扣费支出,26 退货包裹扣费支出30支付宝充值;31 云仓退货支出33 分销退货包裹超重花费32 分销退货包裹发货花费退款34 礼物单退费35 额外包裹创建36 额外包裹作废37 额外订单超重支出38 退货包裹作废返还55 同步物流支出
充值 = 1, 充值 = 1,
//采购花费 = 2, //采购花费 = 2,
//产品退款到账 = 3, //产品退款到账 = 3,
@@ -77,17 +79,31 @@ namespace AllBase.Model.DBModel
//产品退款扣除 = 6, //产品退款扣除 = 6,
//运费退款扣除 = 7, //运费退款扣除 = 7,
礼物单支出 = 16, 礼物单支出 = 16,
中转仓扣费支出 = 20,
中转仓作废收入 = 23, 发货包裹扣费支出 = 20,
中转仓超重支出 = 24, 发货包裹作废返还 = 23,
发货包裹超重支出 = 24,
退货包裹扣费支出 = 26, 退货包裹扣费支出 = 26,
支付宝在线充值 = 30, 退货包裹超重支出 = 28,
云仓退货支出 = 31,
礼物单退费 = 34,
额外订单创建 = 35,
额外订单作废 = 36,
额外订单超重支出 = 37,
退货包裹作废返还 = 38, 退货包裹作废返还 = 38,
支付宝在线充值 = 30,
退货仓退货支出 = 31,
退货仓作废返还 = 32,
退货仓超重支出 = 33,
礼物单退费 = 34,
额外包裹创建支出 = 35,
额外包裹作废返还 = 36,
额外包裹超重支出 = 37,
额外包裹退货拦截创建支出 = 39,
额外包裹退货拦截作废返还 = 40,
额外包裹退货拦截超重支出 = 41,
同步物流 = 55, 同步物流 = 55,
} }
@@ -154,7 +154,7 @@ public sealed class TicketOrderOption
var goodsName = string.Join( 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) .Select(item => item.title)
.Where(title => !string.IsNullOrWhiteSpace(title)) .Where(title => !string.IsNullOrWhiteSpace(title))
.Distinct()); .Distinct());
@@ -166,7 +166,7 @@ public sealed class TicketOrderOption
AppId = appId?.Trim(), AppId = appId?.Trim(),
OrderId = order.order_id, OrderId = order.order_id,
GoodsName = goodsName, 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) .Select(item => item.thumb_img)
.FirstOrDefault(url => !string.IsNullOrWhiteSpace(url)), .FirstOrDefault(url => !string.IsNullOrWhiteSpace(url)),
Amount = (order.order_price ?? 0) / 100m, Amount = (order.order_price ?? 0) / 100m,
+5 -2
View File
@@ -15,7 +15,7 @@ namespace Work.ERP.API.Orders
{ {
public class ShipGiftServiceApi 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 string data = JsonConvert.SerializeObject(new
{ {
@@ -25,7 +25,10 @@ namespace Work.ERP.API.Orders
userName = BaseClass.UserName, userName = BaseClass.UserName,
giftOrderType = (int)giftType, giftOrderType = (int)giftType,
amount = (int)(amount * 100), amount = (int)(amount * 100),
oemAmount = (int)(oemGiftAmount * 100) oemAmount = (int)(oemGiftAmount * 100),
parentOemAmount = (int)(parentOemGiftAmount * 100),
oemId = oemId,
parentOemId = parentOemId
}); });
Debug.WriteLine($"礼品单:{data}"); Debug.WriteLine($"礼品单:{data}");
var result = await ERPHttp.e57PostResponseAsync<Result>("/prod-api/api/oms-api/gift/order/deliveryFor29Erp", data); var result = await ERPHttp.e57PostResponseAsync<Result>("/prod-api/api/oms-api/gift/order/deliveryFor29Erp", data);
+72
View File
@@ -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
{ {
@@ -136,6 +138,7 @@ namespace Work
} }
BaseClass.ParentAuthority = BaseRegex.GetStringJson(ref html, "parent_authority").ParseToString(); BaseClass.ParentAuthority = BaseRegex.GetStringJson(ref html, "parent_authority").ParseToString();
BaseClass.AllowTraditionalBuyAddress = BaseRegex.GetStringJson(ref html, "allow_traditional_buy_address").ParseToInt() == 1;
BaseClass.ForbiddenPage = BaseRegex.GetStringJson(ref html, "forbidden_page").ParseToString(); BaseClass.ForbiddenPage = BaseRegex.GetStringJson(ref html, "forbidden_page").ParseToString();
BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile"); BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile");
BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt(); BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt();
@@ -150,8 +153,11 @@ namespace Work
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order")); BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
BaseClass.RechargeAmountTotal = BaseRegex.GetDecimalJson(ref html, "recharge_amount_total"); BaseClass.RechargeAmountTotal = BaseRegex.GetDecimalJson(ref html, "recharge_amount_total");
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order"); 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.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name"); 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"); BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
#if DEBUG #if DEBUG
if (!string.IsNullOrEmpty(BaseRegex.GetStringJson(ref html, "order_api_url")) && !BaseClass.LoginApiUrl.Contains("localhost") && !BaseClass.LoginApiUrl.Contains("127.0.0.1")) if (!string.IsNullOrEmpty(BaseRegex.GetStringJson(ref html, "order_api_url")) && !BaseClass.LoginApiUrl.Contains("localhost") && !BaseClass.LoginApiUrl.Contains("127.0.0.1"))
@@ -228,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>
/// 注册账户 /// 注册账户
+70
View File
@@ -85,6 +85,76 @@ namespace Work._29Tools.BLL
return result; return result;
} }
public static async Task<string> YangkeduoPostResponseAsync(BuyerLoginInfo buyer, string _url, string _data, string referer)
{
string cookies = "";
try
{
var cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(buyer?.cookie.ParseToString());
if (cookieLst == null)
cookieLst = new List<CefSharp.Cookie>();
foreach (var cook in cookieLst)
{
cookies += cook.Name + "=" + cook.Value + ";";
}
}
catch { }
HttpWebResponse response = null;
string result;
try
{
string url = _url;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.KeepAlive = true;
request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
request.Accept = "application/json, text/plain, */*";
request.Headers.Add("sec-ch-ua", @"""Not)A;Brand"";v=""8"", ""Chromium"";v=""138""");
request.Headers.Add("sec-ch-ua-mobile", @"?0");
request.Headers.Add("Origin", @"https://mobile.yangkeduo.com");
request.Headers.Set(HttpRequestHeader.Cookie, cookies);
//request.Headers.Add("VerifyAuthToken", @"m1PjolxzzHNRdzkNf4X0rQ4b1c734034415e092");
request.Headers.Add("Sec-Fetch-Site", @"same-origin");
request.Headers.Add("Sec-Fetch-Mode", @"cors");
request.Headers.Add("Sec-Fetch-Dest", @"empty");
request.Referer = referer;
//request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd");
request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
request.Method = "POST";
request.ServicePoint.Expect100Continue = false;
string body = _data;
byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body);
request.ContentLength = postBytes.Length;
Stream stream = request.GetRequestStream();
stream.Write(postBytes, 0, postBytes.Length);
stream.Close();
response = (HttpWebResponse)await request.GetResponseAsync();
}
catch (WebException ex)
{
if (ex.Status == WebExceptionStatus.ProtocolError)
{
response = (HttpWebResponse)ex.Response;
result = HttpResponseBLL.ReadResponse(response);
return result;
}
else return ex.Message;
}
catch (Exception e)
{
if (response != null) response.Close();
return e.Message;
}
result = HttpResponseBLL.ReadResponse(response);
return result;
}
public static string YangkeduoGetResponse(BuyerLoginInfo buyer, string _url, string referer = "") public static string YangkeduoGetResponse(BuyerLoginInfo buyer, string _url, string referer = "")
{ {
string cookies = ""; string cookies = "";
+1 -1
View File
@@ -218,7 +218,7 @@ namespace Work._29Tools.BLL
sb.Append("&order_id=").Append(order.order_id); sb.Append("&order_id=").Append(order.order_id);
sb.Append("&ds_order_id=").Append(dropShopOrderId); sb.Append("&ds_order_id=").Append(dropShopOrderId);
sb.Append("&dropship_product_list=").Append("["); 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("},"); sb.Append("{\"spu_id\":\"").Append(item.product_id).Append("\",\"sku_id\":\"").Append(item.sku_id).Append("\",\"product_cnt\":").Append(item.sku_cnt).Append("},");
} }
+163 -29
View File
@@ -91,9 +91,9 @@ namespace TemuKJD.ToolForms
// 订单仓库 // 订单仓库
private TransitWarehouseParam transitWarehouse = null; private TransitWarehouseParam transitWarehouse = null;
// (拍单后)回调函数,过滤订单 // (拍单后)回调函数,过滤订单
private Action<oms_wei_order_info, bool> 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>
@@ -109,7 +109,21 @@ namespace TemuKJD.ToolForms
//txtBuyTransitWarehouseRandomStr = value; //txtBuyTransitWarehouseRandomStr = value;
var numberDic = TransitWarehouseData.dicChineseNumberChar; var numberDic = TransitWarehouseData.dicChineseNumberChar;
var txtBuyTransitWarehouseRandomStrTmp = txtBuyTransitWarehouseRandomStr = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室"; var txtBuyTransitWarehouseRandomStrTmp = txtBuyTransitWarehouseRandomStr = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室";
if (BaseClass.Setting.SwitchEnablePddTransitTraditionalAddress == true)
//if (BaseClass.Setting.SwitchEnablePddTransitTraditionalAddress == true)
var canUseTraditionalAddress = false;
if (orderItem?.TransitPackageLatest?.oms_wei_external_procurement_log_info is oms_wei_external_procurement_log_info transitInfo)
{
if (orderItem.refund_status == 1 && transitInfo.refund_status.ParseToString().Contains("退款成功") && !orderItem.TransitPackageLatest.WarehouseStatus.ParseToString().Contains("取号异常(超区)"))
{
canUseTraditionalAddress = true;
}
else
{
canUseTraditionalAddress = false;
}
}
if (BaseClass.AllowTraditionalBuyAddress && canUseTraditionalAddress == true)
{ {
for (int i = 0; i < 10 && txtBuyTransitWarehouseRandomStrTmp == txtBuyTransitWarehouseRandomStr; i++) for (int i = 0; i < 10 && txtBuyTransitWarehouseRandomStrTmp == txtBuyTransitWarehouseRandomStr; i++)
{ {
@@ -131,7 +145,7 @@ namespace TemuKJD.ToolForms
bool HasChangeAddress = false; bool HasChangeAddress = false;
public PddMobileBuyOrderForm(Action<oms_wei_order_info, bool> 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();
@@ -257,7 +271,7 @@ namespace TemuKJD.ToolForms
this.txtShopGoodsName.Text = orderItem.title; this.txtShopGoodsName.Text = orderItem.title;
this.txtShopSpecName.Text = orderItem.SkuAttrStr; this.txtShopSpecName.Text = orderItem.SkuAttrStr;
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString(); 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; this.txtOrderId.Text = orderItem.order_id;
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString()); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
@@ -594,7 +608,7 @@ namespace TemuKJD.ToolForms
if (IsAutoBuy && GlobalConfig.AutoBuyConfig.IsLimitMinProfit) 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 profit = salePrice - buyPrice * 0.01m;
var limitProfit = GlobalConfig.AutoBuyConfig.MinProfit * 0.01m; var limitProfit = GlobalConfig.AutoBuyConfig.MinProfit * 0.01m;
if (profit < limitProfit) if (profit < limitProfit)
@@ -1309,7 +1323,7 @@ namespace TemuKJD.ToolForms
{ {
if (order.IsWaitBuy) 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) if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
{ {
@@ -1374,7 +1388,7 @@ namespace TemuKJD.ToolForms
{ {
if (order.IsWaitBuy) 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) || 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) || (item.out_product_id == pddBuyMap.spu_code && item.SkuAttrStr == pddBuyMap.sku_code) ||
@@ -1440,7 +1454,7 @@ namespace TemuKJD.ToolForms
// return; // return;
//} //}
if (BuyType == "transit" && string.IsNullOrEmpty(txtBuyTransitWarehouseStr)) if ((BuyType == "transit" || BuyType == "transit_extra") && string.IsNullOrEmpty(txtBuyTransitWarehouseStr))
{ {
if (!IsAutoBuy) if (!IsAutoBuy)
BaseMsgForm.ShowError("缺少中转地址,请重新绑定商品并选择仓库地址"); BaseMsgForm.ShowError("缺少中转地址,请重新绑定商品并选择仓库地址");
@@ -1449,7 +1463,7 @@ namespace TemuKJD.ToolForms
return; return;
} }
var transit = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransFullAddress == txtBuyTransitWarehouseStr); var transit = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransFullAddress == txtBuyTransitWarehouseStr);
if (BuyType == "transit" && transit == null) if ((BuyType == "transit" || BuyType == "transit_extra") && transit == null)
{ {
if (!IsAutoBuy) if (!IsAutoBuy)
BaseMsgForm.ShowError("中转地址对应的中转仓不存在,请核对"); BaseMsgForm.ShowError("中转地址对应的中转仓不存在,请核对");
@@ -1486,6 +1500,7 @@ namespace TemuKJD.ToolForms
body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号 body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号
body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerId"] = buyer.buyer_id; // 买手ID
body["buyerAccount"] = buyer.buyer_nick; // 买手昵称 body["buyerAccount"] = buyer.buyer_nick; // 买手昵称
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号 body["express1Company"] = ""; // 物流公司编号
@@ -1501,31 +1516,29 @@ namespace TemuKJD.ToolForms
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); 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]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); 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 url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var dataStr = JsonHelper.SerializeObject(body); var dataStr = JsonHelper.SerializeObject(body);
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" + //dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +
// ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}"; // ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}";
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
//<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult> //<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult>
//<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult> //<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult>
if (!exportRst.ParseToString().Contains("<code>200</code>")) if (!exportRst.ParseToString().Contains("\"code\":200"))
{
await Task.Delay(500);
exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
}
if (!exportRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = ""; string msg = "";
string code = ""; msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
try
{
System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
xmlDoc.LoadXml(exportRst);
code = xmlDoc["AjaxResult"]["code"].InnerText;
msg = xmlDoc["AjaxResult"]["msg"].InnerText;
}
catch
{
msg = exportRst.ParseToString();
}
if (!IsAutoBuy) if (!IsAutoBuy)
BaseMsgForm.ShowError("拍单保存失败,服务端返回 " + msg, "拍单信息保存失败"); BaseMsgForm.ShowError("拍单保存失败,服务端返回 " + msg, "拍单信息保存失败");
else if (this.Created) else if (this.Created)
@@ -1535,7 +1548,7 @@ namespace TemuKJD.ToolForms
} }
if (updateBalanceAction != null) if (updateBalanceAction != null)
updateBalanceAction(); await updateBalanceAction();
orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info() orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
{ {
@@ -1559,7 +1572,7 @@ namespace TemuKJD.ToolForms
order.SetOrderTextProperty(); order.SetOrderTextProperty();
if (filterOrderAction != null && order != null) if (filterOrderAction != null && order != null)
{ {
filterOrderAction(order, true); await filterOrderAction(order, true);
} }
//// 前一天的订单直接提前取号 //// 前一天的订单直接提前取号
@@ -1647,7 +1660,7 @@ namespace TemuKJD.ToolForms
var order = orderItem?.ItemOrder; var order = orderItem?.ItemOrder;
if (filterOrderAction != null && order != null) if (filterOrderAction != null && order != null)
{ {
filterOrderAction(order, true); await filterOrderAction(order, true);
} }
} }
#endregion #endregion
@@ -1656,6 +1669,127 @@ namespace TemuKJD.ToolForms
BaseMsgForm.ShowInfo("拍单信息保存成功"); BaseMsgForm.ShowInfo("拍单信息保存成功");
} }
else if (BuyType == "transit_extra")
{
#region 秒退额外拍单
if (AbnormalTransitWarehouseOrderInfo == null)
{
JObject body = new JObject();
body["orderNo"] = orderItem.order_id; // 微信订单号
body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号
body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerId"] = buyer.buyer_id; // 买手ID
body["buyerAccount"] = buyer.buyer_nick; // 买手昵称
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号
body["express1Waybill"] = ""; // 物流编号
body["platform"] = transit.TransId; // 中转仓ID
body["orderPlatformCode"] = "WEISHOP";
body["randomCode"] = txtSourceCode.Text.Trim();
if (GlobalConfig.BuyConfig.IsUseAppBalance)
{
body["userName"] = BaseClass.UserName; // 软件端用户名
body["purchaserNote"] = BaseClass.UserName + "-" + BaseClass.NickName; // 购买软件账户备注
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["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);
var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
if (!exportRst.ParseToString().Contains("\"code\":200"))
{
await Task.Delay(500);
exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
}
if (!exportRst.ParseToString().Contains("\"code\":200"))
{
string msg = "";
msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
if (!IsAutoBuy)
BaseMsgForm.ShowError("拍单保存失败,服务端返回 " + msg, "拍单信息保存失败");
else if (this.Created)
Invoke(() => { lblErrMsg.Text = "拍单保存失败,服务端返回 " + msg; });
btnManualUpdateBuyOrder.Enabled = true;
return;
}
if (updateBalanceAction != null)
await updateBalanceAction();
orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
{
buyer_account = buyer.buyer_nick,
id = 0,
order_void_status = 0,
platform = transit.TransId,
order_no = orderItem.order_id,
order_sku_id = orderItem.sku_id,
out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt(),
out_order_no = txtBuyOrderId.Text.Trim(),
order_code = txtBuyOrderId.Text.Trim(),
purchaser_note = body["purchaserNote"].ParseToString(),
created_time = DateTime.Now,
});
orderItem.SetOrderItemTextProperty();
// 利润计算重置为最小值,控件Resource更新时将计算利润
orderItem.ProfitCount = decimal.MinValue;
var order = orderItem?.ItemOrder;
orderItem.SetOrderItemTextProperty();
order.SetOrderTextProperty();
if (filterOrderAction != null && order != null)
{
await filterOrderAction(order, true);
}
//// 前一天的订单直接提前取号
//if (DateTime.Now.Date > BaseClass.StampToDateTime(order.create_time).Date)
//{
// JObject data = new JObject();
// data["outOrderNo"] = txtBuyOrderId.Text.Trim();
// //data2["outOrderNo"] = orderItem.ItemTransitOrder.order_code;
// data["warehouseCode"] = transit.TransId; // 中转仓仓库对应编码 XDYSZC XDYYWC ...
// //data["warehouseCode"] = txtBuyOrderId.Text.Trim(); // 中转仓仓库对应编码
// data["platform"] = "WEISHOP";
// var getVirtualTicketUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/order/virtual/create";
// var getVirtualTicketDataStr = JsonHelper.SerializeObject(data);
// var getVirtualTicketRst = HttpResponseWXBLL.e57PostResponse(getVirtualTicketUrl, getVirtualTicketDataStr, "");
// if (!getVirtualTicketRst.ParseToString().Contains("<code>200</code>") && !getVirtualTicketRst.ParseToString().Contains("<code>0</code>"))
// {
// string msg = "";
// string code = "";
// try
// {
// System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
// xmlDoc.LoadXml(getVirtualTicketRst);
// code = xmlDoc["AjaxResult"]["code"].InnerText;
// msg = xmlDoc["AjaxResult"]["msg"].InnerText;
// }
// catch
// {
// msg = getVirtualTicketRst.ParseToString();
// }
// if (!IsAutoBuy)
// BaseMsgForm.ShowError("拍单信息保存成功,接收到服务端传递的错误消息:" + msg, "订单提前取号失败");
// else if (this.Created)
// Invoke(() => { lblErrMsg.Text = "拍单信息保存成功,接收到服务端传递的错误消息:" + msg; });
// btnManualUpdateBuyOrder.Enabled = true;
// return;
// }
//}
}
#endregion
}
if (BuyType == "direct") if (BuyType == "direct")
{ {
#region 直发拍单 #region 直发拍单
@@ -30,9 +30,9 @@ namespace Work._29Tools.Forms.UserForms
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.pbQrcode = new System.Windows.Forms.PictureBox(); this.pbQrcode = new System.Windows.Forms.PictureBox();
this.btnRefresh = new DevComponents.DotNetBar.PanelEx(); this.btnRefresh = new DevComponents.DotNetBar.PanelEx();
@@ -505,9 +505,11 @@ namespace Work._29Tools.Forms.UserForms
"支付宝充值", "支付宝充值",
"礼物单支出/礼物单退费", "礼物单支出/礼物单退费",
"拍单扣除/作废返还", "拍单扣除/作废返还",
"额外包裹扣费支出/返还",
"退货包裹扣费支出/返还",
"云仓退货扣费支出/返还",
"超重扣费支出", "超重扣费支出",
"退货包裹扣费支出", "同步物流"});
"云仓退货扣费支出"});
this.cmbType.Location = new System.Drawing.Point(42, 33); this.cmbType.Location = new System.Drawing.Point(42, 33);
this.cmbType.Name = "cmbType"; this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(121, 25); this.cmbType.Size = new System.Drawing.Size(121, 25);
@@ -551,20 +553,20 @@ namespace Work._29Tools.Forms.UserForms
// //
this.dgvPayment.AllowUserToAddRows = false; this.dgvPayment.AllowUserToAddRows = false;
this.dgvPayment.AllowUserToDeleteRows = false; this.dgvPayment.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvPayment.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvPayment.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
this.dgvPayment.AutoRowNumber = true; this.dgvPayment.AutoRowNumber = true;
this.dgvPayment.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvPayment.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvPayment.BackgroundColor = System.Drawing.Color.White; this.dgvPayment.BackgroundColor = System.Drawing.Color.White;
this.dgvPayment.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvPayment.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvPayment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvPayment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.dgvPayment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPayment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvPayment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvPayment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck, this.colCheck,
@@ -608,8 +610,8 @@ namespace Work._29Tools.Forms.UserForms
// //
// colAmount // colAmount
// //
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colAmount.DefaultCellStyle = dataGridViewCellStyle3; this.colAmount.DefaultCellStyle = dataGridViewCellStyle6;
this.colAmount.FillWeight = 60F; this.colAmount.FillWeight = 60F;
this.colAmount.HeaderText = "金额"; this.colAmount.HeaderText = "金额";
this.colAmount.Name = "colAmount"; this.colAmount.Name = "colAmount";
@@ -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,25 +135,15 @@ namespace Work._29Tools.Forms.UserForms
loginForm.ShowDialog(); loginForm.ShowDialog();
if (updateBalanceAction != null) if (updateBalanceAction != null)
{ {
updateBalanceAction(); await updateBalanceAction();
} }
} }
} }
private List<user_payment_record> paymentList; private List<user_payment_record> paymentList;
public async void GetBalanceList() private string GetBalanceFilters()
{ {
int pageCount = 1; var data3 = "&user_name_in=" + BaseClass.UserName;
int pageSize = 50;
Invoke(new Action(() =>
{
this.dgvPayment.Rows.Clear();
}));
var url3 = BaseClass.Build29WxObjString("user/get_user_balance");
var data3 = UserLogin.GetSignaturex();
Invoke(new Action(() =>
{
data3 += "&user_name_in=" + BaseClass.UserName;
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
if (cmbType.Text == "充值") if (cmbType.Text == "充值")
@@ -166,30 +156,62 @@ namespace Work._29Tools.Forms.UserForms
data3 += "&type_in=16,34"; data3 += "&type_in=16,34";
else if (cmbType.Text == "拍单扣除/作废返还") else if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23"; data3 += "&type_in=20,23";
else if (cmbType.Text == "超重扣费支出") else if (cmbType.Text == "退货包裹扣费支出/返还")
data3 += "&type_in=24"; data3 += "&type_in=26,38";
else if (cmbType.Text == "退货包裹扣费支出") else if (cmbType.Text == "额外包裹扣费支出/返还")
data3 += "&type_in=26"; data3 += "&type_in=35,36";
else if (cmbType.Text == "云仓退货扣费支出") else if (cmbType.Text == "云仓退货扣费支出")
data3 += "&type_in=31"; data3 += "&type_in=31,32";
else if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=24,28,33,37,41";
else if (cmbType.Text == "同步物流")
data3 += "&type_in=55";
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim())) if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim(); data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim())) if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim(); data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
data3 += "&page=" + ucSplitPage1.CurrentPage; return data3;
data3 += "&page_size=" + ucSplitPage1.PageSize; }
private static List<user_payment_record> ReadBalancePage(string filters, int page, int pageSize, out int count, out decimal seconds)
{
var url = BaseClass.Build29WxObjString("user/get_user_balance");
var data = UserLogin.GetSignaturex() + filters + "&page=" + page + "&page_size=" + pageSize;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
throw new InvalidOperationException($"第 {page} 页查询失败:" + (string.IsNullOrEmpty(html) ? "服务器无响应" : BaseRegex.GetStringJsonByRegs(ref html, html, "msg")));
var result = JObject.Parse(html);
count = (int)result["count"];
seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
return JsonConvert.DeserializeObject<List<user_payment_record>>(result["data"]?.ToString() ?? "null") ?? throw new InvalidOperationException($"第 {page} 页缺少消费记录");
}
public void GetBalanceList()
{
int page = 1, pageSize = 50;
string filters = null;
Invoke(new Action(() =>
{
this.dgvPayment.Rows.Clear();
paymentList = null;
filters = GetBalanceFilters();
page = ucSplitPage1.CurrentPage;
pageSize = ucSplitPage1.PageSize; pageSize = ucSplitPage1.PageSize;
})); }));
var html3 = GetHtml.PostUtf8(url3, data3); int count;
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200")) decimal seconds;
html3 = GetHtml.PostUtf8(url3, data3); try
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
{ {
BaseMsgForm.ShowError("查询失败:" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg")); paymentList = ReadBalancePage(filters, page, pageSize, out count, out seconds);
}
catch (Exception ex)
{
BaseMsgForm.ShowError("查询失败:" + ex.Message);
return; return;
} }
paymentList = new List<user_payment_record>();
paymentList = JsonHelper.DeserializeJsonToList<user_payment_record>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
foreach (var payment in paymentList) foreach (var payment in paymentList)
{ {
if (!this.Created) if (!this.Created)
@@ -208,12 +230,11 @@ namespace Work._29Tools.Forms.UserForms
this.dgvPayment.Rows[rowIndex].Height = 60; this.dgvPayment.Rows[rowIndex].Height = 60;
})); }));
} }
int count = BaseRegex.GetIntJson(ref html3, "count"); int pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
pageCount = Math.Max(pageCount, 1); pageCount = Math.Max(pageCount, 1);
ucSplitPage1.TotalPage = pageCount; ucSplitPage1.TotalPage = pageCount;
#if DEBUG #if DEBUG
Invoke(new Action(() => { statusBarUserControl1.lblTaskStatus.Text = BaseRegex.GetDecimalJson(ref html3, "seconds") + "秒"; })); Invoke(new Action(() => { statusBarUserControl1.lblTaskStatus.Text = seconds + "秒"; }));
#endif #endif
Invoke(new Action(() => Invoke(new Action(() =>
{ {
@@ -273,7 +294,20 @@ namespace Work._29Tools.Forms.UserForms
private void exportRecord_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void exportRecord_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
if (paymentList != null) var menu = new ContextMenuStrip();
menu.Items.Add("导出当页", null, async (s, args) => await ExportRecords(false)).Enabled = paymentList != null;
menu.Items.Add("导出全部", null, async (s, args) => await ExportRecords(true));
menu.Closed += (s, args) => BeginInvoke(new Action(menu.Dispose));
menu.Show(exportRecord, 0, exportRecord.Height);
}
private async Task ExportRecords(bool allPages)
{
var records = paymentList;
var filters = GetBalanceFilters();
int pageSize = ucSplitPage1.PageSize;
exportRecord.Enabled = false;
try
{ {
using (SaveFileDialog saveFileDialog = new SaveFileDialog()) using (SaveFileDialog saveFileDialog = new SaveFileDialog())
{ {
@@ -282,21 +316,48 @@ namespace Work._29Tools.Forms.UserForms
saveFileDialog.FileName = $"消费记录_{dtpTimeBegin.Value:yyyyMMdd}_{dtpTimeEnd.Value:yyyyMMdd}.csv"; saveFileDialog.FileName = $"消费记录_{dtpTimeBegin.Value:yyyyMMdd}_{dtpTimeEnd.Value:yyyyMMdd}.csv";
saveFileDialog.RestoreDirectory = true; saveFileDialog.RestoreDirectory = true;
if (saveFileDialog.ShowDialog() == DialogResult.OK) if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
if (allPages)
{
statusBarUserControl1.pgbTaskProgress.Maximum = 100;
statusBarUserControl1.InitProgressBar();
statusBarUserControl1.UpdateProgressBarStatus("正在读取第 1 页…");
records = await ReadAllBalancePages(filters, pageSize);
statusBarUserControl1.UpdateProgressBarStatus($"正在保存 {records.Count} 条记录…");
}
var fileName = saveFileDialog.FileName;
await Task.Run(() => SaveBalanceRecords(fileName, records));
if (allPages && !IsDisposed)
{
statusBarUserControl1.UpdateProgressBar(100);
statusBarUserControl1.FinishProgressBar($"导出完成,共 {records.Count} 条记录");
}
MessageBox.Show("导出成功");
}
}
}
catch (Exception ex)
{
if (allPages && !IsDisposed)
statusBarUserControl1.UpdateProgressBarStatus("导出失败:" + ex.Message);
BaseMsgForm.ShowError("导出失败:" + ex.Message);
}
finally
{
if (!IsDisposed)
exportRecord.Enabled = true;
}
}
private static void SaveBalanceRecords(string fileName, List<user_payment_record> records)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.AppendLine("类型,订单ID,金额,余额,创建时间,备注"); sb.AppendLine("类型,订单ID,金额,余额,创建时间,备注");
foreach (var item in paymentList) foreach (var item in records)
{ {
//var rowIndex = this.dgvPayment.Rows.Add(
// false,
// ((EnumOrderPaymentType)payment.type.ParseToInt()).ParseToString(),
// item.order_id,
// item.amount,
// item.balance,
// item.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
// item.remark
//);
string type = "未知"; string type = "未知";
if (item.type.HasValue) if (item.type.HasValue)
{ {
@@ -309,14 +370,33 @@ namespace Work._29Tools.Forms.UserForms
sb.AppendLine($"{type},{item.order_id},{item.amount},{item.balance},{item.create_time.ToString("yyyy-MM-dd HH:mm:ss")},{item.remark}"); sb.AppendLine($"{type},{item.order_id},{item.amount},{item.balance},{item.create_time.ToString("yyyy-MM-dd HH:mm:ss")},{item.remark}");
} }
File.WriteAllText(saveFileDialog.FileName, sb.ToString(), Encoding.UTF8); File.WriteAllText(fileName, sb.ToString(), Encoding.UTF8);
MessageBox.Show("导出成功");
}
} }
} private async Task<List<user_payment_record>> ReadAllBalancePages(string filters, int pageSize)
} {
var records = new List<user_payment_record>();
int expectedCount = 0;
for (int page = 1; ; page++)
{
int count = 0;
var batch = await Task.Run(() => ReadBalancePage(filters, page, pageSize, out count, out _));
if (page == 1)
expectedCount = count;
if (count != expectedCount || batch.Count != Math.Min(pageSize, expectedCount - records.Count))
throw new InvalidOperationException($"第 {page} 页记录数有变化,请重新导出。");
records.AddRange(batch);
int totalPages = Math.Max(1, (int)Math.Ceiling((double)expectedCount / pageSize));
statusBarUserControl1.UpdateProgressBar((int)(99L * page / totalPages));
statusBarUserControl1.UpdateProgressBarStatus($"已读取 {page}/{totalPages} 页,共 {records.Count}/{expectedCount} 条");
if (records.Count == expectedCount)
{
Debug.Assert(page == totalPages);
return records;
}
}
}
private async Task GetUserAmountSummary() private async Task GetUserAmountSummary()
{ {
@@ -24,7 +24,9 @@ namespace WxOrder.Framework.Commons
public DialogWindow(Window owner = null) public DialogWindow(Window owner = null)
{ {
InitializeComponent(); InitializeComponent();
Owner = owner ?? Application.Current.MainWindow; Owner = owner ?? Application.Current.Windows
.OfType<Window>()
.FirstOrDefault(w => w.IsActive) ?? Application.Current.MainWindow;
isConstructorSuccessful = true; isConstructorSuccessful = true;
dialogWindowStyle = (Style)TryFindResource("DialogWindowStyle"); dialogWindowStyle = (Style)TryFindResource("DialogWindowStyle");
Loaded += DialogWindow_Loaded; Loaded += DialogWindow_Loaded;