Compare commits
80
Commits
f89670877d
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3f4e34def | ||
|
|
9e10d29bfe | ||
|
|
8008dfb527 | ||
|
|
4ca9c082a1 | ||
|
|
5f08abec0f | ||
|
|
b8674a11c5 | ||
|
|
5ef326d19c | ||
|
|
2295b0df48 | ||
|
|
15b8288a98 | ||
|
|
d9e8011564 | ||
|
|
fb8e6a5479 | ||
|
|
c7cdf3ff88 | ||
|
|
82165f25a8 | ||
|
|
fe8f9851fe | ||
|
|
3d091462c5 | ||
|
|
78a64aa661 | ||
|
|
71614f64e4 | ||
|
|
04a8ba0472 | ||
|
|
a93ab77028 | ||
|
|
d17cb0f139 | ||
|
|
60db6f933d | ||
|
|
761e3f102f | ||
|
|
98531e0344 | ||
|
|
ee10fb5ea8 | ||
|
|
79b0027b7e | ||
|
|
344cbb4ac2 | ||
|
|
200e5bc8c8 | ||
|
|
4b554b55d9 | ||
|
|
dadbb67914 | ||
|
|
4e641928be | ||
|
|
4bbb46304d | ||
|
|
42ed8fc929 | ||
|
|
ba6da5e85f | ||
|
|
ec13db7cc1 | ||
|
|
a03f00fcdb | ||
|
|
942ca54dd8 | ||
|
|
6e8ff468f8 | ||
|
|
ac93305d5f | ||
|
|
5b9ed01fa1 | ||
|
|
9789a4686f | ||
|
|
1ee4c99647 | ||
|
|
8fc0e404c3 | ||
|
|
c4c54fc03e | ||
|
|
d43cf21afc | ||
|
|
7ac3c67242 | ||
|
|
72c85ca3f1 | ||
|
|
518365a0d3 | ||
|
|
27ac748f33 | ||
|
|
3483c99d37 | ||
|
|
a4bc9a788e | ||
|
|
8f7e190974 | ||
|
|
85259d8335 | ||
|
|
5777c30048 | ||
|
|
c40e591317 | ||
|
|
54986faa50 | ||
|
|
30808d56e8 | ||
|
|
679f6cc9e6 | ||
|
|
a5889085d4 | ||
|
|
6d3f9e4118 | ||
|
|
96214a54ea | ||
|
|
f167c2585d | ||
|
|
671ca453e0 | ||
|
|
da01c9f83f | ||
|
|
70996d5409 | ||
|
|
bf3b6487f0 | ||
|
|
be8c0bd1e2 | ||
|
|
cefea9dc1a | ||
|
|
430bf8d574 | ||
|
|
e08b4797cb | ||
|
|
679bd39144 | ||
|
|
1a5f40926b | ||
|
|
6029eda6de | ||
|
|
9545de7684 | ||
|
|
6b8557f8b2 | ||
|
|
4b34090cec | ||
|
|
d76cf5c342 | ||
|
|
d70b74ee4a | ||
|
|
1172670a7e | ||
|
|
be0be1866d | ||
|
|
a31b87b512 |
No files matched your search
@@ -124,8 +124,8 @@ namespace _29WxOrderWpf.BaseWindows
|
||||
MainWindow.Instance.borderMessage.BorderBrush = Application.Current.Resources["pageColorBrush"] as SolidColorBrush;
|
||||
MainWindow.Instance.tbMessage.Foreground = Application.Current.Resources["pageColorBrush"] as SolidColorBrush;
|
||||
}
|
||||
if (type.ToLower() == "error")
|
||||
{
|
||||
if (type.ToLower() == "err" || type.ToLower() == "error")
|
||||
{
|
||||
MainWindow.Instance.borderMessage.BorderBrush = Application.Current.Resources["PageWarningBrush"] as SolidColorBrush;
|
||||
MainWindow.Instance.tbMessage.Foreground = Application.Current.Resources["PageWarningBrush"] as SolidColorBrush;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -209,7 +209,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -224,7 +223,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -405,7 +405,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
// 售后 第一页
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/complaint_list.html"))
|
||||
{
|
||||
await Task.Run(() =>
|
||||
await Task.Run(async () =>
|
||||
{
|
||||
if (data1.Contains("listItemStatusVo") && data1.Contains("afterSalesId") && data1.Contains("statusText"))
|
||||
{
|
||||
@@ -421,7 +421,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var jObj = JsonHelper.JObjectParse(jsonData);
|
||||
jObj["result"] = jObj["all"];
|
||||
jObj["result"]["listItemVOList"] = jObj["result"]["list"];
|
||||
CefReadBuyerAfterSale(buyerId, JsonHelper.SerializeObject(jObj));
|
||||
await CefReadBuyerAfterSale(buyerId, JsonHelper.SerializeObject(jObj));
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -431,14 +431,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
});
|
||||
}
|
||||
// 读取售后
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/blade/after_sales_list"))
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
CefReadBuyerAfterSale(url1, data1);
|
||||
});
|
||||
}
|
||||
// 读取售后
|
||||
if (url1.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/blade/after_sales_list"))
|
||||
{
|
||||
await CefReadBuyerAfterSale(url1, data1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -514,52 +511,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
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)
|
||||
{
|
||||
@@ -651,7 +602,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
pdd_afterSale.AfterSaleAddress = buyer_after_sale?.afterSaleAddress;
|
||||
}
|
||||
|
||||
void CefReadBuyerOrder(string url, string data)
|
||||
async Task CefReadBuyerOrder(string url, string data)
|
||||
{
|
||||
if (data.Contains("轻奢壁挂式香皂盒置物架卫生间沥水家居可拆卸收纳盒翻盖肥皂盒"))
|
||||
{
|
||||
@@ -697,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)
|
||||
{
|
||||
if (!lstSyncLogistics.Contains(syncOrder))
|
||||
@@ -717,7 +668,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
|
||||
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
|
||||
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);
|
||||
|
||||
@@ -895,7 +846,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}));
|
||||
}
|
||||
|
||||
Task.Run(() =>
|
||||
await Task.Run(() =>
|
||||
{
|
||||
// 根据订单状态 取号/修改取号
|
||||
if (order.WxSendTypeStr == "直发")
|
||||
@@ -1021,7 +972,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", lstPddBuyerOrderInfoLite);
|
||||
}
|
||||
|
||||
void CefReadBuyerAfterSale(string url, string data)
|
||||
async Task CefReadBuyerAfterSale(string url, string data)
|
||||
{
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => url.Contains(b.buyer_id));
|
||||
if (buyer == null)
|
||||
@@ -1065,7 +1016,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
|
||||
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 orderItem in order.orderItems)
|
||||
@@ -1343,7 +1294,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (!lstPddBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
|
||||
{
|
||||
lstPddBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
|
||||
OrderListRowItemCtrl.VoidOrder(orderItem, true);
|
||||
await OrderTransitService.VoidOrder(orderItem, null, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1813,13 +1764,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (btn.DataContext is PddBuyerOrderLiteInfo buyerOrder)
|
||||
{
|
||||
btn.IsEnabled = false;
|
||||
Task.Run(() =>
|
||||
Task.Run(async () =>
|
||||
{
|
||||
var out_order_nos = buyerOrder.order_sn;
|
||||
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
|
||||
|
||||
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 orderItem in order.orderItems)
|
||||
@@ -2152,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>();
|
||||
foreach (var combine in pddPickInfo.combine_list)
|
||||
@@ -2167,8 +2118,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (orderSnTracks.Count == 0)
|
||||
return;
|
||||
|
||||
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
|
||||
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
|
||||
//var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
|
||||
var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
|
||||
foreach (var sOrder in syncOrderList)
|
||||
{
|
||||
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
|
||||
@@ -2249,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
|
||||
{
|
||||
@@ -2260,7 +2211,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
// 取最新订单状态
|
||||
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
|
||||
var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
|
||||
if (wxOrder == null)
|
||||
throw new Exception("买手单对应微信订单不存在!");
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
|
||||
|
||||
@@ -337,7 +337,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder);
|
||||
UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse);
|
||||
|
||||
this.txtShopNameVal = orderItem.Shop.ShopAccount;
|
||||
this.txtShopNameVal = orderItem?.ItemOrder?.Shop?.ShopAccount;
|
||||
this.txtOrderIdVal = orderItem.order_id;
|
||||
this.txtShopSkuIdVal = orderItem.sku_id;
|
||||
this.txtShopGoodsIdVal = orderItem.product_id;
|
||||
@@ -626,11 +626,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var pddFrontSkuInfo = new frontSkuInfo3()
|
||||
{
|
||||
skuId = key.ParseToLong(),
|
||||
skuID = key.ParseToLong(),
|
||||
//skuID = key.ParseToLong(),
|
||||
goodsId = pddFrontGoods3.goodsId,
|
||||
thumbUrl = thumbUrl,
|
||||
quantity = tbSku2.quantity,
|
||||
isOnsale = 1,
|
||||
//quantity = tbSku2.quantity,
|
||||
//isOnsale = 1,
|
||||
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
|
||||
specs = pddSpecs,
|
||||
price = tbSku2.price.priceMoney.ParseToInt() + 100,
|
||||
@@ -732,7 +732,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -763,7 +763,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -1022,7 +1022,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
/// <summary>
|
||||
/// 更新拍单成功信息
|
||||
/// </summary>
|
||||
public void ManualUpdateBuyOrder()
|
||||
public async void ManualUpdateBuyOrder()
|
||||
{
|
||||
if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6)
|
||||
{
|
||||
@@ -1119,24 +1119,18 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +
|
||||
// ",\"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>订单不存在: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 code = "";
|
||||
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();
|
||||
}
|
||||
msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
|
||||
this.ErrorMsg = "拍单保存失败,服务端返回 " + msg;
|
||||
Enabled = true;
|
||||
return;
|
||||
@@ -1148,10 +1142,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
buyer_account = buyer.buyer_id,
|
||||
id = 0,
|
||||
order_void_status = 0,
|
||||
platform = transit.TransId,
|
||||
order_no = orderItem.order_id,
|
||||
order_sku_id = orderItem.sku_id,
|
||||
out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(),
|
||||
out_order_no = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
out_order_no = txtBuyOrderIdVal.Trim(),
|
||||
order_code = txtBuyOrderIdVal.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
created_time = DateTime.Now,
|
||||
});
|
||||
@@ -1222,6 +1219,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (BuyType == "direct")
|
||||
{
|
||||
#region 直发拍单
|
||||
if (orderItem.ItemOrder?.Shop == null)
|
||||
{
|
||||
this.ErrorMsg = "缺少店铺信息!";
|
||||
return;
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
@@ -1241,8 +1243,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_id = orderItem.order_id,
|
||||
sku_id = orderItem.sku_id,
|
||||
out_order_id = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
shop_app_id = orderItem.Shop.ShopId,
|
||||
shop_name = orderItem.Shop.ShopAccount,
|
||||
shop_app_id = orderItem.ItemOrder?.Shop?.ShopId,
|
||||
shop_name = orderItem.ItemOrder?.Shop?.ShopAccount,
|
||||
buy_type = "直发",
|
||||
};
|
||||
var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info");
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.CefHelper;
|
||||
using WxOrder.Framework.Commons;
|
||||
using _29WxOrderWpf.ViewModels;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
@@ -27,12 +26,14 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Interop;
|
||||
using System.Windows.Media.Imaging;
|
||||
using TemuKJD.ToolForms;
|
||||
using Work;
|
||||
using Work._29Tools.BLL;
|
||||
using Work._29Tools.CefTools;
|
||||
using Work.BaseForms;
|
||||
using WxOrder.Framework.Commons;
|
||||
using WxOrder.Framework.Helpers;
|
||||
using static AllBase.DouYinModel.Result.DouOrderListInfo;
|
||||
using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
|
||||
@@ -337,7 +338,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder);
|
||||
UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse);
|
||||
|
||||
this.txtShopNameVal = orderItem.Shop.ShopAccount;
|
||||
this.txtShopNameVal = orderItem.ItemOrder?.Shop?.ShopAccount;
|
||||
this.txtOrderIdVal = orderItem.order_id;
|
||||
this.txtShopSkuIdVal = orderItem.sku_id;
|
||||
this.txtShopGoodsIdVal = orderItem.product_id;
|
||||
@@ -1334,11 +1335,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var pddFrontSkuInfo = new frontSkuInfo3()
|
||||
{
|
||||
skuId = key.ParseToLong(),
|
||||
skuID = key.ParseToLong(),
|
||||
//skuID = key.ParseToLong(),
|
||||
goodsId = pddFrontGoods3.goodsId,
|
||||
thumbUrl = thumbUrl,
|
||||
quantity = tbSku2.quantity,
|
||||
isOnsale = 1,
|
||||
//quantity = tbSku2.quantity,
|
||||
//isOnsale = 1,
|
||||
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
|
||||
specs = pddSpecs,
|
||||
price = tbSku2.price?.priceMoney.ParseToInt() + 100,
|
||||
@@ -1440,7 +1441,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -1471,7 +1472,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -1543,7 +1544,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
return "获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
|
||||
return "溯源码获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1736,9 +1737,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
/// <summary>
|
||||
/// 更新拍单成功信息
|
||||
/// </summary>
|
||||
public void ManualUpdateBuyOrder()
|
||||
public async void ManualUpdateBuyOrder()
|
||||
{
|
||||
if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6)
|
||||
if (BuyType == "transit" && txtSourceCodeVal.ParseToString().Trim().Length != 6)
|
||||
{
|
||||
ErrorMsg = "溯源码长度错误!";
|
||||
return;
|
||||
@@ -1831,26 +1832,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +
|
||||
// ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}";
|
||||
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, "");
|
||||
//<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult>
|
||||
//<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult>
|
||||
if (!exportRst.ParseToString().Contains("<code>200</code>"))
|
||||
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 = "";
|
||||
string code = "";
|
||||
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();
|
||||
}
|
||||
msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
|
||||
this.ErrorMsg = "拍单保存失败,服务端返回 " + msg;
|
||||
Enabled = true;
|
||||
return;
|
||||
@@ -1862,10 +1853,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
{
|
||||
buyer_account = buyer.buyer_id,
|
||||
id = 0,
|
||||
order_void_status = 0,
|
||||
platform = transit.TransId,
|
||||
order_no = orderItem.order_id,
|
||||
order_sku_id = orderItem.sku_id,
|
||||
out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(),
|
||||
out_order_no = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
order_code = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
created_time = DateTime.Now,
|
||||
});
|
||||
@@ -1936,6 +1930,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (BuyType == "direct")
|
||||
{
|
||||
#region 直发拍单
|
||||
if (orderItem.ItemOrder?.Shop == null)
|
||||
{
|
||||
this.ErrorMsg = "缺少店铺信息!";
|
||||
return;
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
@@ -1955,8 +1954,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_id = orderItem.order_id,
|
||||
sku_id = orderItem.sku_id,
|
||||
out_order_id = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
shop_app_id = orderItem.Shop.ShopId,
|
||||
shop_name = orderItem.Shop.ShopAccount,
|
||||
shop_app_id = orderItem.ItemOrder?.Shop?.ShopId,
|
||||
shop_name = orderItem.ItemOrder?.Shop?.ShopAccount,
|
||||
buy_type = "直发",
|
||||
};
|
||||
var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info");
|
||||
|
||||
@@ -433,52 +433,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
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)
|
||||
{
|
||||
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 syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos);
|
||||
var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
|
||||
foreach (var syncOrder in syncOrderList)
|
||||
{
|
||||
if (!lstSyncLogistics.Contains(syncOrder))
|
||||
@@ -754,7 +708,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
|
||||
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
|
||||
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);
|
||||
|
||||
@@ -1103,7 +1057,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
|
||||
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 orderItem in order.orderItems)
|
||||
@@ -1124,11 +1078,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
|
||||
foreach (TbBuyerAfterSaleLiteInfo af in list)
|
||||
{
|
||||
if (af?.orderSn == "tb_5127796188031004903")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
af.buyerId = buyer.buyer_id;
|
||||
af.buyerName = buyer.buyer_name;
|
||||
|
||||
@@ -1361,7 +1310,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (!lstTbBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
|
||||
{
|
||||
lstTbBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
|
||||
OrderListRowItemCtrl.VoidOrder(orderItem, true);
|
||||
await OrderTransitService.VoidOrder(orderItem, null, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1672,13 +1621,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder)
|
||||
{
|
||||
btn.IsEnabled = false;
|
||||
Task.Run(() =>
|
||||
Task.Run(async () =>
|
||||
{
|
||||
var out_order_nos = buyerOrder.order_sn;
|
||||
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
|
||||
|
||||
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 orderItem in order.orderItems)
|
||||
@@ -2016,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>();
|
||||
foreach (var combine in tbPickInfo.combine_list)
|
||||
@@ -2031,8 +1980,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (orderSnTracks.Count == 0)
|
||||
return;
|
||||
|
||||
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
|
||||
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
|
||||
//var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
|
||||
var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
|
||||
foreach (var sOrder in syncOrderList)
|
||||
{
|
||||
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
|
||||
@@ -2113,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
|
||||
{
|
||||
@@ -2124,7 +2073,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
|
||||
// 取最新订单状态
|
||||
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault();
|
||||
var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
|
||||
if (wxOrder == null)
|
||||
throw new Exception("买手单对应微信订单不存在!");
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||
using _29WxOrderWpf.ViewModels;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.DBModel;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using TemuKJD.ToolForms;
|
||||
using WxOrder.Framework.Commons;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
|
||||
internal class OrderBuyerOrdersHelper
|
||||
{
|
||||
public static void ShowBuyerOrder(oms_wei_order_item_info orderItem, string buyerAccount, string buyerName, string outOrderId, bool isShowOrderList = false)
|
||||
{
|
||||
if (outOrderId.StartsWith("tb_")) // 淘宝买手及订单
|
||||
{
|
||||
var buyer = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(p => p.buyer_id == buyerAccount || p.buyer_name == buyerName);
|
||||
if (buyer == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("该订单买手号未在当前账户登录");
|
||||
return;
|
||||
}
|
||||
|
||||
var url = "";
|
||||
if (isShowOrderList)
|
||||
url = "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?";
|
||||
else
|
||||
url = "https://trade.tmall.com/detail/orderDetail.htm?bizOrderId=" + outOrderId.Replace("tb_", "");
|
||||
|
||||
TaobaoBuyOrderCtrl taobaoBuyView = new TaobaoBuyOrderCtrl(GlobalConfig.CurrentTaobaoBuyer, orderItem);
|
||||
taobaoBuyView.ViewModel.InitUrl = url;
|
||||
new DialogWindow()
|
||||
{
|
||||
Title = "订单查看 - 当前买手 " + buyer.buyer_nick,
|
||||
Content = taobaoBuyView,
|
||||
Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
|
||||
Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
|
||||
WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
||||
}.ShowDialog();
|
||||
}
|
||||
else // 拼多多买手及订单
|
||||
{
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(p => p.buyer_id == buyerAccount || p.buyer_name == buyerName);
|
||||
if (buyer == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("该订单买手号未在当前账户登录");
|
||||
return;
|
||||
}
|
||||
|
||||
var url = "";
|
||||
if (isShowOrderList)
|
||||
url = "https://mobile.yangkeduo.com/index.html"; /* 订单列表 */
|
||||
else
|
||||
url = "https://mobile.yangkeduo.com/order.html?order_sn=" + outOrderId + "&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order" +
|
||||
"&refer_page_id=10032_" + BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10) + "&refer_page_sn=10032";
|
||||
|
||||
// 拍单的时候检测一下买手号
|
||||
if (buyer.status == "在线")
|
||||
{
|
||||
PddMobileLoginViewModel.CheckBuyerLogin(buyer);
|
||||
}
|
||||
if (buyer.status != "在线")
|
||||
{
|
||||
BaseMsgWindow.ShowError("买手号掉线");
|
||||
return;
|
||||
}
|
||||
|
||||
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance, orderItem, buyer, orderItem.PddBuyMap)
|
||||
{
|
||||
TitleText = "订单查看 - 当前买手 " + buyer.buyer_nick,
|
||||
InitUrl = url /* 订单页面 */
|
||||
};
|
||||
buyOrderForm.pnlBuy.Visible = false;
|
||||
|
||||
//已有拍单关联的控制界面显示隐藏
|
||||
if (orderItem.PddBuyMap != null)
|
||||
{
|
||||
buyOrderForm.pnlBuy.Visible = true;
|
||||
buyOrderForm.pnlMap.Visible = false;
|
||||
}
|
||||
buyOrderForm.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,547 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.DBModel;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Work;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
|
||||
public class OrderGetOrderListHelper
|
||||
{
|
||||
/// <summary>
|
||||
/// 增量读取全部订单信息
|
||||
/// </summary>
|
||||
/// <param name="lastUpdateTime"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task GetWxOrderIncrementAsync(DateTime? lastUpdateTime)
|
||||
{
|
||||
if (lastUpdateTime == null || lastUpdateTime == DateTime.MinValue)
|
||||
return;
|
||||
|
||||
var shopIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var shopIds = string.Join(",", shopIdList);
|
||||
|
||||
var existOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var updateOrderList = await GetOrderInfoBase(null, 0, shopIds, lastUpdateTime);
|
||||
var updateOrderIdList = GlobalConfig.ShopLoginList.Select(s => s.ErpShopId.ToString()).ToList();
|
||||
var orderIdList = existOrderIdList;
|
||||
orderIdList.AddRange(updateOrderIdList);
|
||||
orderIdList = orderIdList.Distinct().ToList();
|
||||
|
||||
while(orderIdList.Count > 0 )
|
||||
{
|
||||
var orderIdTake = orderIdList.Take(500).ToList();
|
||||
orderIdList.RemoveAll(o => orderIdTake.Contains(o));
|
||||
|
||||
var orderIds = string.Join(",", orderIdTake);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取买手号订单对应的微信店铺订单信息
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
|
||||
{
|
||||
return await GetOrderInfoBase(order_ids);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取订单详情信息
|
||||
/// </summary>
|
||||
/// <param name="orderIds"></param>
|
||||
/// <returns></returns>
|
||||
static async Task<List<oms_wei_order_info>> GetOrderInfoBase(string orderIds, int pageSize = 100, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null)
|
||||
{
|
||||
if (string.IsNullOrEmpty(orderIds))
|
||||
return new List<oms_wei_order_info>();
|
||||
|
||||
Thread.Sleep(100);
|
||||
try
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&erp_order_id_in=" + orderIds;
|
||||
data += "&page_size=" + pageSize;
|
||||
if (!string.IsNullOrWhiteSpace(shopIds))
|
||||
data += "&erp_shop_id_in=" + shopIds;
|
||||
if (beginUpdateTime != null && beginUpdateTime != DateTime.MinValue)
|
||||
{
|
||||
var startTime = BaseClass.DateTimeToTimestampSeconds(beginUpdateTime.Value);
|
||||
data += "&start_time=" + startTime;
|
||||
}
|
||||
if (endUpdateTime != null && endUpdateTime != DateTime.MinValue)
|
||||
{
|
||||
var endTime = BaseClass.DateTimeToTimestampSeconds(endUpdateTime.Value);
|
||||
data += "&end_time=" + endTime;
|
||||
}
|
||||
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 Exception("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
}
|
||||
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
|
||||
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html)["data"].ParseToString());
|
||||
if (orders == null)
|
||||
orders = new List<oms_wei_order_info>();
|
||||
|
||||
var orderItems = await GetOrderItemInfo(orderIds);
|
||||
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 (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
return new List<oms_wei_order_info>();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取订单详情信息
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_order_item_info>> GetOrderItemInfo(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_order_item_info>();
|
||||
var url = BaseClass.Build29WxObjString("order/get_erp_order_item_list");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&erp_order_id_in=" + order_ids;
|
||||
data += "&page_size=" + 2500;
|
||||
var html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单详情读取失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
|
||||
}
|
||||
List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
|
||||
try
|
||||
{
|
||||
orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item_info>(JObject.Parse(html)["data"].ParseToString());
|
||||
if (orderItems == null)
|
||||
orderItems = new List<oms_wei_order_item_info>();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
orderItems = new List<oms_wei_order_item_info>();
|
||||
BaseMsgWindow.ShowAnimateMessage("订单详情读取失败 " + ex.Message, "Error", 5);
|
||||
}
|
||||
return orderItems;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取售后单
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_refund_info>> GetOrderRefundInfo(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_refund_info>();
|
||||
Thread.Sleep(100);
|
||||
var url2 = BaseClass.Build29WxObjString("order/get_erp_refund_list");
|
||||
var data2 = UserLogin.GetSignaturex();
|
||||
data2 += "&erp_order_id_in=" + order_ids;
|
||||
var html2 = await GetHtml.PostUtf8Async(url2, data2);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
html2 = await GetHtml.PostUtf8Async(url2, data2);
|
||||
if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
|
||||
{
|
||||
//BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
//break;
|
||||
}
|
||||
List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
|
||||
try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
|
||||
return refunds;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取扩展订单信息
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_item_ext>> GetOrderItemExts(string order_ids)
|
||||
{
|
||||
List<order_item_ext> existOrderExtList = new List<order_item_ext>();
|
||||
if (!string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&wx_order_id_in=" + order_ids;
|
||||
var html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (!html.Contains("\"code\":200"))
|
||||
html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (!html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单扩展信息查询失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 5);
|
||||
}
|
||||
try
|
||||
{
|
||||
existOrderExtList = JsonHelper.DeserializeJsonToList<order_item_ext>(JsonHelper.JObjectParse(html)["data"].ParseToString());
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
return existOrderExtList;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取中转仓订单发货包裹信息
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_external_procurement_log_info>> GetTransitWarehouseList(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_external_procurement_log_info>();
|
||||
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&order_no=" + order_ids;
|
||||
data3 += "&page_size=5000";
|
||||
var html3 = await GetHtml.PostUtf8Async(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
html3 = await GetHtml.PostUtf8Async(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
|
||||
}
|
||||
List<oms_wei_external_procurement_log_info> transitOrderList = new List<oms_wei_external_procurement_log_info>();
|
||||
try
|
||||
{
|
||||
transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log_info>(JObject.Parse(html3)["data"].ParseToString());
|
||||
return transitOrderList;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return new List<oms_wei_external_procurement_log_info>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取中转仓额外包裹
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_transfer_extra_package>> GetTransitExtraPackageList(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_transfer_extra_package>();
|
||||
|
||||
var url3 = BaseClass.Build29WxObjString("order/wx_get_transfer_extra_package");
|
||||
var data3 = UserLogin.GetSignaturex();
|
||||
data3 += "&order_no=" + order_ids;
|
||||
var html3 = await GetHtml.PostUtf8Async(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
html3 = await GetHtml.PostUtf8Async(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败 " + BaseRegex.GetStringJson(ref html3, "msg"), "Error", 5);
|
||||
}
|
||||
List<oms_wei_transfer_extra_package> transitExtraPackageList = new List<oms_wei_transfer_extra_package>();
|
||||
try
|
||||
{
|
||||
transitExtraPackageList = JsonHelper.DeserializeJsonToList<oms_wei_transfer_extra_package>(JObject.Parse(html3)["data"].ParseToString());
|
||||
return transitExtraPackageList;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return new List<oms_wei_transfer_extra_package>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取中转仓退货包裹
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_external_procurement_after_sale_info>> GetTransitWarehouseAfterSaleList(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<oms_wei_external_procurement_after_sale_info>();
|
||||
|
||||
// 读取中转仓处理售后单
|
||||
var url5 = BaseClass.Build29WxObjString("order/wx_get_transit_warehouse_aftersale_list");
|
||||
var data5 = UserLogin.GetSignaturex();
|
||||
data5 += "&wx_order_id_in=" + order_ids;
|
||||
var html5 = await GetHtml.PostUtf8Async(url5, data5);
|
||||
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
|
||||
html5 = await GetHtml.PostUtf8Async(url5, data5);
|
||||
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("云仓售后订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
|
||||
}
|
||||
List<oms_wei_external_procurement_after_sale_info> transitAfterSaleList = new List<oms_wei_external_procurement_after_sale_info>();
|
||||
try
|
||||
{
|
||||
transitAfterSaleList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_after_sale_info>(JObject.Parse(html5)["data"].ParseToString())
|
||||
.OrderByDescending(p => p.created_time).ToList();
|
||||
if (transitAfterSaleList != null)
|
||||
return transitAfterSaleList;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return new List<oms_wei_external_procurement_after_sale_info>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取退货仓包裹
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<distrib_return_order_info>> GetTransitReturnOrderList(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<distrib_return_order_info>();
|
||||
|
||||
// 读取退货仓包裹
|
||||
var url5 = BaseClass.Build29WxObjString("order/wx_get_erp_return_order_list");
|
||||
var data5 = UserLogin.GetSignaturex();
|
||||
data5 += "&erp_order_id_in=" + order_ids;
|
||||
var html5 = await GetHtml.PostUtf8Async(url5, data5);
|
||||
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
|
||||
html5 = await GetHtml.PostUtf8Async(url5, data5);
|
||||
if (string.IsNullOrEmpty(html5) || !html5.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("云仓分销退货订单读取失败 " + BaseRegex.GetStringJson(ref html5, "msg"), "Error", 5);
|
||||
}
|
||||
List<distrib_return_order_info> transitAfterSaleList = new List<distrib_return_order_info>();
|
||||
try
|
||||
{
|
||||
transitAfterSaleList = JsonHelper.DeserializeJsonToList<distrib_return_order_info>(JObject.Parse(html5)["data"].ParseToString())
|
||||
.OrderByDescending(p => p.created_at).ToList();
|
||||
if (transitAfterSaleList != null)
|
||||
return transitAfterSaleList;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return new List<distrib_return_order_info>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取多多买手单
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_pdd_buyer_order>> GetPddBuyerOrders(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<order_pdd_buyer_order>();
|
||||
|
||||
var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
|
||||
var data4 = UserLogin.GetSignaturex();
|
||||
data4 += "&wx_order_id_in=" + order_ids;
|
||||
var html4 = await GetHtml.PostUtf8Async(url4, data4);
|
||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
||||
html4 = await GetHtml.PostUtf8Async(url4, data4);
|
||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
|
||||
}
|
||||
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||
try
|
||||
{
|
||||
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
|
||||
.OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||
return pddBuyerOrders;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return new List<order_pdd_buyer_order>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取淘宝买手单
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_pdd_buyer_order>> GetTbBuyerOrders(string order_ids)
|
||||
{
|
||||
if (string.IsNullOrEmpty(order_ids))
|
||||
return new List<order_pdd_buyer_order>();
|
||||
|
||||
var url4 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_order_list");
|
||||
var data4 = UserLogin.GetSignaturex();
|
||||
data4 += "&wx_order_id_in=" + order_ids;
|
||||
var html4 = await GetHtml.PostUtf8Async(url4, data4);
|
||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
||||
html4 = await GetHtml.PostUtf8Async(url4, data4);
|
||||
if (string.IsNullOrEmpty(html4) || !html4.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手) " + BaseRegex.GetStringJson(ref html4, "msg"), "Error", 5);
|
||||
}
|
||||
List<order_pdd_buyer_order> pddBuyerOrders = new List<order_pdd_buyer_order>();
|
||||
try
|
||||
{
|
||||
pddBuyerOrders = JsonHelper.DeserializeJsonToList<order_pdd_buyer_order>(JObject.Parse(html4)["data"].ParseToString())
|
||||
.OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||
return pddBuyerOrders;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return new List<order_pdd_buyer_order>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取多多售后
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_pdd_buyer_after_sale>> GetPddBuyerAfterSales(string order_ids)
|
||||
{
|
||||
var url6 = BaseClass.Build29WxObjString("order/wx_get_buyer_after_sale_list");
|
||||
var data6 = UserLogin.GetSignaturex();
|
||||
data6 += "&wx_order_id_in=" + order_ids;
|
||||
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||
if (!string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
var html6 = await GetHtml.PostUtf8Async(url6, data6);
|
||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
||||
html6 = await GetHtml.PostUtf8Async(url6, data6);
|
||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
|
||||
return new List<order_pdd_buyer_after_sale>();
|
||||
}
|
||||
try
|
||||
{
|
||||
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||
return pddBuyerAfterSales;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
return new List<order_pdd_buyer_after_sale>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取淘宝售后
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<order_pdd_buyer_after_sale>> GetTbBuyerAfterSales(string order_ids)
|
||||
{
|
||||
var url6 = BaseClass.Build29WxObjString("order/wx_get_tb_buyer_after_sale_list");
|
||||
var data6 = UserLogin.GetSignaturex();
|
||||
data6 += "&wx_order_id_in=" + order_ids;
|
||||
List<order_pdd_buyer_after_sale> pddBuyerAfterSales = new List<order_pdd_buyer_after_sale>();
|
||||
if (!string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
var html6 = await GetHtml.PostUtf8Async(url6, data6);
|
||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
||||
html6 = await GetHtml.PostUtf8Async(url6, data6);
|
||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
|
||||
return new List<order_pdd_buyer_after_sale>();
|
||||
}
|
||||
try
|
||||
{
|
||||
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<order_pdd_buyer_after_sale>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.TransitCreateTime).ToList();
|
||||
return pddBuyerAfterSales;
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
return new List<order_pdd_buyer_after_sale>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取同步单信息
|
||||
/// </summary>
|
||||
/// <param name="buyer_order_ids"></param>
|
||||
/// <param name="not_upload_pickup_status"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<yh_sync_logistics>> GetSyncLogistics(string buyer_order_ids, int? not_upload_pickup_status = null)
|
||||
{
|
||||
var url6 = BaseClass.Build29WxObjString("order/wx_get_sync_waybill");
|
||||
var data6 = UserLogin.GetSignaturex();
|
||||
data6 += "&order_id=" + buyer_order_ids;
|
||||
if (not_upload_pickup_status != null)
|
||||
data6 += "¬_upload_pickup_status=" + not_upload_pickup_status;
|
||||
List<yh_sync_logistics> pddBuyerAfterSales = new List<yh_sync_logistics>();
|
||||
if (!string.IsNullOrEmpty(buyer_order_ids))
|
||||
{
|
||||
var html6 = await GetHtml.PostUtf8Async(url6, data6);
|
||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
||||
html6 = await GetHtml.PostUtf8Async(url6, data6);
|
||||
if (string.IsNullOrEmpty(html6) || !html6.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("订单读取失败(买手售后) " + BaseRegex.GetStringJson(ref html6, "msg"), "Error", 6);
|
||||
return new List<yh_sync_logistics>();
|
||||
}
|
||||
try
|
||||
{
|
||||
pddBuyerAfterSales = JsonHelper.DeserializeJsonToList<yh_sync_logistics>(JObject.Parse(html6)["data"].ParseToString()).OrderByDescending(p => p.id).ToList();
|
||||
return pddBuyerAfterSales;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
}
|
||||
}
|
||||
return new List<yh_sync_logistics>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取店铺物流信息
|
||||
/// </summary>
|
||||
/// <param name="order_ids"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<oms_wei_ewaybill_path>> GetEWaybillPath(string order_ids)
|
||||
{
|
||||
List<oms_wei_ewaybill_path> oms_wei_ewaybill_path_list = null;
|
||||
if (!string.IsNullOrEmpty(order_ids))
|
||||
{
|
||||
try
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_erp_ewaybill_path_latest_list");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&erp_order_id_in=" + order_ids;
|
||||
var html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = await GetHtml.PostUtf8Async(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("物流查询失败 " + BaseRegex.GetStringJson(ref html, "msg"), "Error", 6);
|
||||
}
|
||||
else
|
||||
{
|
||||
oms_wei_ewaybill_path_list = JsonHelper.DeserializeJsonToList<oms_wei_ewaybill_path>(JObject.Parse(html)["data"].ParseToString()).OrderByDescending(p => p.update_time).ToList();
|
||||
return oms_wei_ewaybill_path_list;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
}
|
||||
return new List<oms_wei_ewaybill_path>();
|
||||
}
|
||||
}
|
||||
@@ -158,7 +158,7 @@ public partial class OrderListCtrl
|
||||
if (ret)
|
||||
{
|
||||
sucessCount++;
|
||||
this.GetOrder(item.order_id);
|
||||
await this.GetOrder(item.order_id);
|
||||
SetProgress(index, count);
|
||||
item.IsSelect = false;
|
||||
}
|
||||
|
||||
@@ -269,11 +269,14 @@
|
||||
Margin="2,0"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
d:Opacity="0.5"
|
||||
d:Visibility="Visible"
|
||||
BorderBrush="{StaticResource mainColorBrush}"
|
||||
Click="chkSyncDirectOrderWaybill_Click"
|
||||
Content="同步物流单"
|
||||
FontSize="12"
|
||||
IsChecked="False" />
|
||||
IsChecked="False"
|
||||
Visibility="Collapsed" />
|
||||
</WrapPanel>
|
||||
|
||||
<wpf:SpacingStackPanel Grid.Column="13" HorizontalSpacing="5">
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -7,7 +7,7 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
||||
d:DesignHeight="50"
|
||||
d:DesignWidth="800"
|
||||
d:DesignWidth="850"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
|
||||
@@ -26,6 +26,7 @@
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="auto" />
|
||||
<ColumnDefinition Width="20" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBox
|
||||
@@ -213,7 +214,20 @@
|
||||
|
||||
<TextBlock
|
||||
Grid.Column="11"
|
||||
Margin="10"
|
||||
Margin="0,0,8,0"
|
||||
HorizontalAlignment="Right"
|
||||
Cursor="Hand"
|
||||
FontSize="20"
|
||||
FontWeight="Bold"
|
||||
Foreground="{StaticResource mainColorBrush}"
|
||||
MouseLeftButtonUp="TextBlock_MouseLeftButtonUp"
|
||||
Style="{StaticResource TextBlockIcon}"
|
||||
Text="{StaticResource txt-arrow_sync}"
|
||||
ToolTip="刷新订单状态" />
|
||||
<!-- Foreground="{Binding ElementName=b_gift, Path=BorderBrush}" -->
|
||||
<TextBlock
|
||||
Grid.Column="12"
|
||||
Margin="0,0,8,0"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="仅退款/退货退款"
|
||||
Foreground="Gray"
|
||||
@@ -221,7 +235,7 @@
|
||||
|
||||
<Border
|
||||
x:Name="borderFlag"
|
||||
Grid.Column="12"
|
||||
Grid.Column="13"
|
||||
Width="auto"
|
||||
Margin="2"
|
||||
VerticalAlignment="Center"
|
||||
|
||||
@@ -31,6 +31,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
/// </summary>
|
||||
public partial class OrderListRowHeaderCtrl : UserControl
|
||||
{
|
||||
public static DateTime LastRefreshTime = DateTime.Now.AddSeconds(-5);
|
||||
|
||||
public OrderListRowHeaderCtrl()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -235,5 +237,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
BaseMsgWindow.ShowError("打开工单窗口失败:" + ex.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async void TextBlock_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
if (!(this.DataContext is oms_wei_order_info order))
|
||||
return;
|
||||
|
||||
if (LastRefreshTime > DateTime.Now.AddSeconds(-5))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("操作太快了请稍候再点击", "Error", 5);
|
||||
return;
|
||||
}
|
||||
|
||||
LastRefreshTime = DateTime.Now;
|
||||
await Task.Run(async () => { await MainWindow.Instance.orderListCtrl.GetOrder(order.order_id); });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -634,8 +634,8 @@
|
||||
Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
|
||||
Text="{Binding BuyerTransitWaybillStatusStr}" />
|
||||
</Border>
|
||||
<Border
|
||||
x:Name="borderWarehouseStatas"
|
||||
<!--<Border
|
||||
x:Name="borderWarehouseStatus"
|
||||
Height="auto"
|
||||
MinWidth="30"
|
||||
Margin="0,0,4,0"
|
||||
@@ -647,7 +647,7 @@
|
||||
BorderThickness="1"
|
||||
CornerRadius="2"
|
||||
Cursor="Hand"
|
||||
MouseUp="borderWarehouseStatas_MouseUp"
|
||||
MouseUp="borderWarehouseStatus_MouseUp"
|
||||
Visibility="{Binding WarehouseWaybillStatusStrVisibility}">
|
||||
<TextBlock
|
||||
x:Name="txtWarehouseStatus"
|
||||
@@ -658,8 +658,33 @@
|
||||
Foreground="{Binding WarehouseWaybillStatusStrColor}"
|
||||
MouseEnter="txtWarehouseStatus_MouseEnter"
|
||||
Text="{Binding WarehouseWaybillStatusStr}" />
|
||||
</Border>
|
||||
</Border>-->
|
||||
<Border
|
||||
x:Name="borderWarehousePackageStatus"
|
||||
Height="auto"
|
||||
MinWidth="30"
|
||||
Margin="0,0,4,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Background="{StaticResource PageOkBrush50}"
|
||||
d:BorderBrush="{StaticResource PageOkBrush}"
|
||||
Background="{Binding WarehouseWaybillStatusBackColor}"
|
||||
BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="2"
|
||||
Cursor="Hand"
|
||||
MouseUp="borderWarehouseStatus_MouseUp"
|
||||
Visibility="{Binding TransitPackageLatestWarehouseStatusStrVisibility}">
|
||||
<TextBlock
|
||||
x:Name="txtWarehouseStatus"
|
||||
MinWidth="20"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="包裹状态"
|
||||
Background="Transparent"
|
||||
Foreground="{Binding WarehouseWaybillStatusStrColor}"
|
||||
MouseEnter="txtWarehouseStatus_MouseEnter"
|
||||
Text="{Binding TransitPackageLatestWarehouseStatusStr}" />
|
||||
</Border>
|
||||
<!--<Border
|
||||
Height="auto"
|
||||
MinWidth="30"
|
||||
Margin="0,0,4,0"
|
||||
@@ -677,6 +702,25 @@
|
||||
Background="Transparent"
|
||||
Foreground="White"
|
||||
Text="{Binding TransitRefundVoidStatusStr}" />
|
||||
</Border>-->
|
||||
<Border
|
||||
Height="auto"
|
||||
MinWidth="30"
|
||||
Margin="0,0,4,0"
|
||||
HorizontalAlignment="Center"
|
||||
Background="{StaticResource pageColorBrush}"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="2"
|
||||
Visibility="{Binding TransitPackageLatestVoidStatusStrVisibility}">
|
||||
<TextBlock
|
||||
MinWidth="20"
|
||||
Padding="0"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="作废状态"
|
||||
Background="Transparent"
|
||||
Foreground="White"
|
||||
Text="{Binding TransitPackageLatestVoidStatusStr}" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
|
||||
@@ -1391,16 +1435,6 @@
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="6">
|
||||
|
||||
<Button
|
||||
x:Name="btnTransitInfo"
|
||||
Height="22"
|
||||
MinWidth="38"
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
Click="btnTransitInfo_Click"
|
||||
Content="云仓详情"
|
||||
Style="{StaticResource BasePageButtonLightStyle}" />
|
||||
|
||||
<Button
|
||||
x:Name="btnMapSkus"
|
||||
Height="22"
|
||||
@@ -1463,11 +1497,29 @@
|
||||
MinWidth="38"
|
||||
Margin="0,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnDirectBuyOrder_Click"
|
||||
Content="直发拍单"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
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
|
||||
x:Name="btnShipGift"
|
||||
@@ -1486,21 +1538,20 @@
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="3">
|
||||
VerticalSpacing="5">
|
||||
|
||||
|
||||
<Button
|
||||
x:Name="btnChangeWaybill"
|
||||
x:Name="btnTransitInfo"
|
||||
Height="22"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnChangeWaybill_Click"
|
||||
Content="补发/修改物流"
|
||||
FontSize="11"
|
||||
Click="btnTransitInfo_Click"
|
||||
Content="云仓详情"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
|
||||
<Button
|
||||
Visibility="{Binding ItemTransitOrderWithVoid, Converter={StaticResource hasValueToVisibilityConverter}}" />
|
||||
<!--<Button
|
||||
x:Name="btnAddEditTransitWarehouseReject_New"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
@@ -1553,7 +1604,75 @@
|
||||
Content="滞留补发买家"
|
||||
FontSize="11"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
|
||||
Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />-->
|
||||
<Button
|
||||
x:Name="btnVoidPackage"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Content="作废包裹"
|
||||
d:Visibility="Visible"
|
||||
Click="btnVoidTransitOrder_Click"
|
||||
Content="{Binding VoidPackageTypeStr}"
|
||||
FontSize="11"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding TransitPackageLatest.VoidPackageBtnVisibility}" />
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseReject_New"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnAddEditTransitWarehouseReject_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding TransitPackageLatest.RejectPackageBtnVisibility}">
|
||||
<TextBlock>
|
||||
云仓拒收<LineBreak />
|
||||
退回总店</TextBlock>
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
Click="btnAddEditTransitWarehouseAfterSale_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding TransitPackageLatest.ReturnPackageBtnVisibility}">
|
||||
<TextBlock>
|
||||
拒收失败<LineBreak />
|
||||
转寄总店</TextBlock>
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
Click="btnAddEditTransitWarehouseAfterSale_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding TransitPackageLatest.InterceptPackageBtnVisibility}">
|
||||
<TextBlock>
|
||||
出库拦截<LineBreak />
|
||||
退回仓库</TextBlock>
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnTransitExtraPackages"
|
||||
Height="20"
|
||||
MinWidth="38"
|
||||
Margin="0,0,0,0"
|
||||
Padding="0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnTransitExtraPackages_Click"
|
||||
Content="滞留补发买家"
|
||||
FontSize="11"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding TransitPackageLatest.ExtraPackagesBtnVisibility}" />
|
||||
</wpf:SpacingStackPanel>
|
||||
</wpf:SpacingStackPanel>
|
||||
</Grid>
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using WxOrder.Framework.Commons;
|
||||
using _29WxOrderWpf.Converters;
|
||||
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||
using _29WxOrderWpf.UserControls;
|
||||
@@ -30,6 +29,7 @@ using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Interop;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Animation;
|
||||
using System.Windows.Media.Imaging;
|
||||
@@ -42,6 +42,7 @@ using Work._29Tools.BLL;
|
||||
using Work._29Tools.Forms.ShopForms;
|
||||
using Work._29Tools.Forms.ToolForms;
|
||||
using Work.BaseForms;
|
||||
using WxOrder.Framework.Commons;
|
||||
using static _29WxOrderWpf.Services.ShipGiftService;
|
||||
using static System.Net.WebRequestMethods;
|
||||
|
||||
@@ -371,7 +372,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 拍单前查询订单是否退款
|
||||
var orderId = orderItem.order_id;
|
||||
var skuId = orderItem.sku_id;
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
@@ -385,18 +386,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!isAbnormalOrder && orderItem.ItemTransitOrder != null)
|
||||
{
|
||||
// 正常单有未作废订单的,不可再拍单
|
||||
BaseMsgWindow.ShowAnimateMessage("该订单已有采购记录", "Error", 5);
|
||||
BaseMsgWindow.ShowAnimateMessage("该订单已有采购记录", "Error", 6);
|
||||
return;
|
||||
}
|
||||
if (isAbnormalOrder && (orderItem.ItemOrder.status <= 21 || orderItem.ItemTransitOrder == null || orderItem.ItemTransitOrder.refund_status != "买手退款成功"))
|
||||
{
|
||||
// 异常单不是被拼多多买家秒退的且已取号的,不可异常重拍
|
||||
BaseMsgWindow.ShowAnimateMessage("该异常单不符合重拍条件", "Error", 5);
|
||||
BaseMsgWindow.ShowAnimateMessage("该异常单不符合重拍条件", "Error", 6);
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果是退款单,弹出退款窗口
|
||||
if (CheckIsRefund(orderItem))
|
||||
if (CheckIsRefund(orderItem, isAutoBuy))
|
||||
return;
|
||||
|
||||
// 拍单前检测买手号是否在线
|
||||
@@ -408,6 +409,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
if (GlobalConfig.CurrentPddBuyer.status != "在线")
|
||||
{
|
||||
OrderListCtrl.IsAutoBuy = false;
|
||||
BaseMsgWindow.ShowError("买手号掉线");
|
||||
return;
|
||||
}
|
||||
@@ -422,6 +424,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (BaseClass.Balance < 10)
|
||||
{
|
||||
OrderListCtrl.IsAutoBuy = false;
|
||||
BaseMsgWindow.ShowError("软件快递余额不足(剩余" + BaseClass.Balance.ToString("0.00") + "元,拍单至少需保留10元),无法中转拍单,请先充值!");
|
||||
return;
|
||||
}
|
||||
@@ -430,9 +433,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
var url = BaseClass.Build29WxObjString("shop/get_shop_erp_merchant");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&corporate_account_user_id=" + orderItem.Shop.ErpCorporateAccountUserId;
|
||||
data += "&manage_user_id=" + orderItem.Shop.ErpManageUserId;
|
||||
data += "&shop_id=" + orderItem.Shop.ErpShopId;
|
||||
data += "&corporate_account_user_id=" + orderItem.ItemOrder.Shop.ErpCorporateAccountUserId;
|
||||
data += "&manage_user_id=" + orderItem.ItemOrder.Shop.ErpManageUserId;
|
||||
data += "&shop_id=" + orderItem.ItemOrder.Shop.ErpShopId;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
@@ -477,9 +480,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
if (orderItem.BuyGoodsBtnTxt == "去店铺后台绑定代发")
|
||||
{
|
||||
if (orderItem.Shop != null)
|
||||
if (orderItem.ItemOrder.Shop != null)
|
||||
{
|
||||
WXShopLoginForm shopLoginForm = new WXShopLoginForm(orderItem.Shop);
|
||||
WXShopLoginForm shopLoginForm = new WXShopLoginForm(orderItem.ItemOrder.Shop);
|
||||
shopLoginForm.openType = Work._29Tools.Forms.ShopForms.EnumOpenType.manage;
|
||||
shopLoginForm.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/supply/consignmentOrderList";
|
||||
@@ -498,15 +501,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// }
|
||||
// catch(Exception ex)
|
||||
// {
|
||||
// BaseMsgWindow.ShowError(ex.Message);
|
||||
// if (isAutoBuy)
|
||||
// BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
// else
|
||||
// BaseMsgWindow.ShowError(ex.Message);
|
||||
// return;
|
||||
// }
|
||||
//}
|
||||
|
||||
// 掉线提示重登
|
||||
if (orderItem.Shop?.LoginStatus != "登录成功")
|
||||
if (orderItem.ItemOrder?.Shop?.LoginStatus != "登录成功")
|
||||
{
|
||||
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == orderItem.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)
|
||||
@@ -575,7 +581,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
if (isAutoBuy)
|
||||
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
else
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -630,7 +639,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
if (isAutoBuy)
|
||||
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
else
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -686,7 +698,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
if (isAutoBuy)
|
||||
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
|
||||
else
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -694,7 +709,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// 绑定或者更换代发
|
||||
/// </summary>
|
||||
/// <param name="orderItem">要发货的订单物品</param>
|
||||
/// <param name="targetSupplierId">targetSupplierId 和 targetSupplierName 都为空表示取消代发</param>
|
||||
@@ -707,7 +722,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
try
|
||||
{
|
||||
// 查询代发列表
|
||||
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
|
||||
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.ItemOrder.Shop, orderItem.order_id, 100);
|
||||
if (!apiSearchDropship.Contains("\"errcode\":0"))
|
||||
throw new Exception("查询代发失败!" + BaseRegex.GetStringJsonByRegs(ref apiSearchDropship, apiSearchDropship, "msg", "errmsg"));
|
||||
|
||||
@@ -718,7 +733,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (!string.IsNullOrEmpty(dsOrderId))
|
||||
{
|
||||
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
|
||||
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.ItemOrder.Shop, orderItem.ItemOrder, dsOrderId);
|
||||
if (!apiCancelDropship.Contains("\"errcode\":0"))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJsonByRegs(ref apiCancelDropship, apiCancelDropship, "msg", "errmsg");
|
||||
@@ -732,7 +747,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!string.IsNullOrEmpty(dsOrderId))
|
||||
{
|
||||
// 查询代发详情
|
||||
var apiSearchDropshipDetail = new WxApiBLL().WxApiDropshipSearchDetail(orderItem.Shop, dsOrderId);
|
||||
var apiSearchDropshipDetail = new WxApiBLL().WxApiDropshipSearchDetail(orderItem.ItemOrder.Shop, dsOrderId);
|
||||
if (!apiSearchDropshipDetail.Contains("\"errcode\":0"))
|
||||
throw new Exception("查询代发失详情失败!" + BaseRegex.GetStringJson(ref apiSearchDropshipDetail, "msg"));
|
||||
|
||||
@@ -741,7 +756,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!string.IsNullOrEmpty(supplierId) && !supplierId.Contains(targetSupplierId) && !supplierName.Contains(targetSupplierName))
|
||||
{
|
||||
// 取消代发
|
||||
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
|
||||
var apiCancelDropship = await new WxApiBLL().WxApiDropshipCancel(orderItem.ItemOrder.Shop, orderItem.ItemOrder, dsOrderId);
|
||||
if (!apiCancelDropship.Contains("\"errcode\":0"))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJsonByRegs(ref apiCancelDropship, apiCancelDropship, "msg", "errmsg");
|
||||
@@ -757,7 +772,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (!supplierId.Contains(targetSupplierId) && !supplierName.Contains(targetSupplierName))
|
||||
{
|
||||
// 设置29供货商代发wxfc630d60a1af6c6f或其他代发
|
||||
var apiAddDropship = new WxApiBLL().WxApiDropshipAssign(orderItem.Shop, orderItem.order_id, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt(), targetSupplierId);
|
||||
var apiAddDropship = new WxApiBLL().WxApiDropshipAssign(orderItem.ItemOrder.Shop, orderItem.order_id, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt(), targetSupplierId);
|
||||
if (!apiAddDropship.Contains("\"errcode\":0"))
|
||||
{
|
||||
throw new Exception("设置代发失败!请确认商品已加入" + targetSupplierName + "代发!" + BaseRegex.GetStringJson(ref apiAddDropship, "msg"));
|
||||
@@ -838,90 +853,23 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
var orderItem = this.DataContext as oms_wei_order_item_info;
|
||||
if (orderItem == null)
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单信息为空");
|
||||
return;
|
||||
}
|
||||
var buyerName = txtTransitOrderBuyerStr.Text;
|
||||
var buyerAccount = txtTransitOrderBuyerStr.Tag.ParseToString();
|
||||
var outOrderId = txtTransitOrderNumStr.Text;
|
||||
if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (outOrderId.StartsWith("tb_")) // 淘宝买手及订单
|
||||
{
|
||||
var buyer = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(p => p.buyer_id == buyerAccount || p.buyer_name == buyerName);
|
||||
if (buyer == null)
|
||||
var buyerName = txtTransitOrderBuyerStr.Text;
|
||||
var buyerAccount = txtTransitOrderBuyerStr.Tag.ParseToString();
|
||||
var outOrderId = txtTransitOrderNumStr.Text;
|
||||
if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
|
||||
{
|
||||
BaseMsgWindow.ShowError("该订单买手号未在当前账户登录");
|
||||
return;
|
||||
}
|
||||
|
||||
var url = "";
|
||||
if (sender == txtTransitOrderBuyerStr)
|
||||
url = "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?";
|
||||
else
|
||||
url = "https://trade.tmall.com/detail/orderDetail.htm?bizOrderId=" + outOrderId.Replace("tb_", "");
|
||||
bool isShowOrderList = sender == txtTransitOrderBuyerStr;
|
||||
|
||||
TaobaoBuyOrderCtrl taobaoBuyView = new TaobaoBuyOrderCtrl(GlobalConfig.CurrentTaobaoBuyer, orderItem);
|
||||
taobaoBuyView.ViewModel.InitUrl = url;
|
||||
new DialogWindow()
|
||||
{
|
||||
Title = "订单查看 - 当前买手 " + buyer.buyer_nick,
|
||||
Content = taobaoBuyView,
|
||||
Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
|
||||
Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
|
||||
WindowStartupLocation = WindowStartupLocation.CenterScreen,
|
||||
}.ShowDialog();
|
||||
}
|
||||
else // 拼多多买手及订单
|
||||
{
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(p => p.buyer_id == buyerAccount || p.buyer_name == buyerName);
|
||||
if (buyer == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("该订单买手号未在当前账户登录");
|
||||
return;
|
||||
}
|
||||
|
||||
var url = "";
|
||||
if (sender == txtTransitOrderBuyerStr)
|
||||
url = "https://mobile.yangkeduo.com/index.html";
|
||||
else
|
||||
url = "https://mobile.yangkeduo.com/order.html?order_sn=" + outOrderId + "&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order" +
|
||||
"&refer_page_id=10032_" + BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10) + "&refer_page_sn=10032";
|
||||
|
||||
// 拍单的时候检测一下买手号
|
||||
if (buyer.status == "在线")
|
||||
{
|
||||
PddMobileLoginViewModel.CheckBuyerLogin(buyer);
|
||||
}
|
||||
if (buyer.status != "在线")
|
||||
{
|
||||
BaseMsgWindow.ShowError("买手号掉线");
|
||||
return;
|
||||
}
|
||||
|
||||
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance,
|
||||
orderItem, buyer, orderItem.PddBuyMap);
|
||||
buyOrderForm.TitleText = "订单查看 - 当前买手 " + buyer.buyer_nick;
|
||||
|
||||
//所有订单页面
|
||||
buyOrderForm.InitUrl = url;
|
||||
buyOrderForm.pnlBuy.Visible = false;
|
||||
|
||||
//已有拍单关联的控制界面显示隐藏
|
||||
if (orderItem.PddBuyMap != null)
|
||||
{
|
||||
buyOrderForm.pnlBuy.Visible = true;
|
||||
buyOrderForm.pnlMap.Visible = false;
|
||||
}
|
||||
buyOrderForm.ShowDialog();
|
||||
OrderBuyerOrdersHelper.ShowBuyerOrder(orderItem, buyerAccount, buyerName, outOrderId, isShowOrderList);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void txtDirectOrderNumStr_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
var orderItem = this.DataContext as oms_wei_order_item_info;
|
||||
@@ -1072,161 +1020,57 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
VoidOrder(orderItem);
|
||||
var transitOrder = orderItem.TransitPackageLatest?.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = orderItem.TransitPackageLatest?.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = orderItem.TransitPackageLatest.oms_wei_transfer_extra_package;
|
||||
|
||||
btnVoidTransitOrder.IsEnabled = false;
|
||||
btnVoidPackage.IsEnabled = false;
|
||||
|
||||
// 作废发货包裹并重新拍单
|
||||
// 作废发货包裹
|
||||
if (transitOrder != null)
|
||||
{
|
||||
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == transitOrder.order_code) ?? transitOrder;
|
||||
await OrderTransitService.VoidOrder(orderItem, transitOrder);
|
||||
}
|
||||
// 作废退货包裹
|
||||
else if (returnOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
returnOrder = orderItem.ItemTransitOrderAfterSales.FirstOrDefault(af => af.external_order_no == returnOrder.external_order_no);
|
||||
var voidResult = await OrderTransitService.VoidAfterSalePackage(orderItem, returnOrder);
|
||||
if (!string.IsNullOrEmpty(voidResult))
|
||||
BaseMsgWindow.ShowInfo(voidResult);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
// 作废额外包裹
|
||||
else if (extOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
extOrder = orderItem.ItemTransitExtraOrders.FirstOrDefault(ex => ex.batchId == extOrder.batchId) ?? extOrder;
|
||||
var voidResult = await OrderTransitService.VoidExtraPackage(orderItem, extOrder);
|
||||
if (!string.IsNullOrEmpty(voidResult))
|
||||
BaseMsgWindow.ShowInfo(voidResult);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
btnVoidTransitOrder.IsEnabled = true;
|
||||
btnVoidPackage.IsEnabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 作废中转仓订单
|
||||
/// </summary>
|
||||
/// <param name="orderItem"></param>
|
||||
/// <param name="isSilent"></param>
|
||||
/// <param name="UpdateOrderBeforeVoid">作废前是否更新服务端订单状态</param>
|
||||
public static async void VoidOrder(oms_wei_order_item_info orderItem, bool isSilent = false, bool UpdateOrderBeforeVoid = true)
|
||||
{
|
||||
// 作废前查询订单状态
|
||||
var orderId = orderItem.order_id;
|
||||
var skuId = orderItem.sku_id;
|
||||
await Task.Run(() =>
|
||||
{
|
||||
if (UpdateOrderBeforeVoid)
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
});
|
||||
if (orderItem == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("订单查询失败,请重试");
|
||||
return;
|
||||
}
|
||||
if (orderItem.ItemTransitOrder == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("要作废的中转订单不存在,请确认后重试");
|
||||
return;
|
||||
}
|
||||
|
||||
if (orderItem.ItemTransitOrder.out_order_no.ParseToString().StartsWith("tb_")) // 淘宝买手售后
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("淘宝买手暂不支持自动售后,请手动申请售后");
|
||||
else
|
||||
orderItem.ItemTransitOrder.refund_status = "淘宝买手暂不支持自动售后,需手动申请售后";
|
||||
}
|
||||
else // 拼多多买手售后
|
||||
{
|
||||
bool noBuyer = false;
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == orderItem?.ItemTransitOrder?.buyer_account || b.buyer_name == orderItem?.ItemTransitOrder?.buyer_account);
|
||||
if (buyer == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
if (BaseMsgWindow.ShowConfirm("拍单买手不存在,点击确定直接作废中转单并手动取消买手单,点击取消登录买手后重试").DialogResult != true)
|
||||
return;
|
||||
noBuyer = true;
|
||||
}
|
||||
|
||||
// 检测一下买手号
|
||||
if (GlobalConfig.CurrentPddBuyer.status == "在线")
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
PddMobileLoginViewModel.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
|
||||
});
|
||||
}
|
||||
if (GlobalConfig.CurrentPddBuyer.status != "在线")
|
||||
{
|
||||
if (!isSilent)
|
||||
if (BaseMsgWindow.ShowConfirm("买手号掉线,点击确定直接作废中转单并手动取消买手单,点击取消登录买手后重试").DialogResult != true)
|
||||
return;
|
||||
noBuyer = true;
|
||||
}
|
||||
|
||||
if (!noBuyer)
|
||||
{
|
||||
PddBuyerOrderLiteInfo order = null;
|
||||
MainWindow.Instance.Dispatcher.Invoke(new Action(() => { }));
|
||||
order = PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite.FirstOrDefault(o => o.order_sn == orderItem.ItemTransitOrder.out_order_no);
|
||||
if (order == null)
|
||||
order = new PddBuyerOrderLiteInfo()
|
||||
{
|
||||
order_status_prompt = "待发货",
|
||||
order_amount = orderItem.ItemTransitOrder.out_amount,
|
||||
order_sn = orderItem.ItemTransitOrder.out_order_no
|
||||
};
|
||||
PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite.Add(order);
|
||||
var pddAfterRst = PDDBuyerOrderReadCtrl.SimPddAfterSale(buyer, order);
|
||||
if (pddAfterRst.Contains("\"after_sales_status\":1") || pddAfterRst.Contains("该订单已全额退款") || pddAfterRst.Contains("订单未付款"))
|
||||
{
|
||||
// 保存退款成功状态
|
||||
order.order_status_prompt = pddAfterRst.Contains("订单未付款") ? "订单未付款" : "退款成功";
|
||||
// 中转仓订单买手号售后信息 存到服务端
|
||||
var refundRst = PDDBuyerOrderReadCtrl.SendTransitAfterSaleE57(order);
|
||||
if (refundRst.Contains("<code>0</code>") || refundRst.Contains("<code>200</code>"))
|
||||
{
|
||||
order.sendStatus = "退款成功 买手退款信息更新成功";
|
||||
}
|
||||
else
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref refundRst, "msg");
|
||||
order.sendStatus = "退款成功 买手退款信息更新失败,服务端返回 " + msg;
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!isSilent)
|
||||
if (BaseMsgWindow.ShowConfirm("买手退款失败,点击确定直接作废中转单并手动取消买手单,点击取消稍候重试").DialogResult != true)
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//订单作废接口(作废重拍)
|
||||
//postman request POST 'http://localhost:8088/oms-api/external_procurement/discardOrder' \
|
||||
// --header 'Content-Type: application/json' \
|
||||
// --body '{
|
||||
// "orderNo":"12334534534",
|
||||
// "outOrderNo":"12312312"
|
||||
//}' 成功返回code:0 失败返回code:1
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
|
||||
var data2 = new JObject();
|
||||
data2["orderNo"] = orderItem.order_id;
|
||||
//data2["outOrderNo"] = orderItem.ItemTransitOrder.out_order_no;
|
||||
data2["outOrderNo"] = orderItem.ItemTransitOrder.order_code;
|
||||
var dataStr2 = JsonHelper.SerializeObject(data2);
|
||||
var discardRst = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
|
||||
if (discardRst.Contains("<code>0</code>") || discardRst.Contains("<code>200</code>"))
|
||||
{
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
#region 立即更新订单
|
||||
orderItem.ItemTransitOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
#endregion
|
||||
|
||||
#region 重新过滤订单
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
MainWindow.Instance.orderListCtrl.FilterOrders();
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowInfo("订单作废成功,请重新拍单");
|
||||
#endregion
|
||||
|
||||
#region 更新拍单余额
|
||||
StartUp.UpdateBalance();
|
||||
#endregion
|
||||
}
|
||||
else
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref discardRst, "msg");
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void txtWarehouseStatus_MouseEnter(object sender, MouseEventArgs e)
|
||||
{
|
||||
@@ -1240,94 +1084,48 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
|
||||
private void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e)
|
||||
private async void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (sender == btnAddEditTransitWarehouseReject && this.DataContext is oms_wei_order_item_info orderItem1 && !string.IsNullOrWhiteSpace(orderItem1.ItemTransitOrderWithVoid?.express_1_waybill))
|
||||
{
|
||||
BaiduGetWaybillInfoView buyerLoginForm = new BaiduGetWaybillInfoView(orderItem1);
|
||||
buyerLoginForm.ViewModel.InitUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + orderItem1.ItemTransitOrderWithVoid?.express_1_waybill;
|
||||
|
||||
new DialogWindow()
|
||||
{
|
||||
Width = 1280,
|
||||
Height = 800,
|
||||
Title = "物流拒收查询",
|
||||
Content = buyerLoginForm,
|
||||
}.Show();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
string msg = $@"
|
||||
云仓拒收退回总店
|
||||
|
||||
说 明:店铺产生售后,拒收成功,货物会原物流退回总店。
|
||||
拒收条件:(总店物流没到云仓/未签收前)。顺丰/京东无法
|
||||
拒收,直接总店申请仅退款让总店拦截。
|
||||
收 费:免费";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
return;
|
||||
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
orderItem.ItemTransitOrders = OrderListCtrl.GetTransitWarehouseList(orderItem.order_id);
|
||||
orderItem.PddBuyerOrders = OrderListCtrl.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());
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
|
||||
//if (orderItem.ItemTransitOrder?.warehouse_status == 3)
|
||||
//{
|
||||
// BaseMsgWindow.ShowError("商品已拒收或拦截!");
|
||||
// return;
|
||||
//}
|
||||
//if (orderItem.ItemTransitOrder?.warehouse_status == 2)
|
||||
//{
|
||||
// BaseMsgWindow.ShowError("商品已出库,请选择退回中转仓!");
|
||||
// return;
|
||||
//}
|
||||
//if (string.IsNullOrEmpty(orderItem.PddBuyerOrder?.order_sn))
|
||||
//{
|
||||
// BaseMsgWindow.ShowError("商品未出单,请直接去拼多多买手申请退款");
|
||||
// return;
|
||||
//}
|
||||
if (orderItem.ItemTransitOrder?.has_reject == 1 || orderItem.ItemTransitOrder?.has_reject == 3)
|
||||
if (sender == btnAddEditTransitWarehouseReject && !string.IsNullOrWhiteSpace(orderItem.ItemTransitOrderWithVoid?.express_1_waybill))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("已申请拒收", "Msg", 3);
|
||||
return;
|
||||
OrderTransitService.ShowRejectTransitOrder(orderItem, orderItem.ItemTransitOrderWithVoid?.express_1_waybill);
|
||||
}
|
||||
else if (sender == btnAddEditTransitWarehouseReject_New)
|
||||
{
|
||||
btnAddEditTransitWarehouseReject_New.IsEnabled = false;
|
||||
|
||||
// 中转仓拒收(已产生物流)
|
||||
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/rejectApply";
|
||||
var dataObj = new JObject();
|
||||
dataObj["orderCode"] = orderItem.ItemTransitOrder?.order_code;
|
||||
dataObj["orderId"] = orderItem.order_id;
|
||||
dataObj["logisticsExpressCode"] = orderItem.PddBuyerOrder?.order_sn;
|
||||
var data = JsonHelper.SerializeObject(dataObj);
|
||||
var html = HttpResponseWXBLL.e57PostResponse(url, data, "");
|
||||
int rejectStatus = 0;
|
||||
if (html.Contains("<code>0</code>") || html.Contains("<code>200</code>"))
|
||||
{
|
||||
rejectStatus = 1;
|
||||
BaseMsgWindow.ShowAnimateMessage("申请成功", "Msg", 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
rejectStatus = 2;
|
||||
var err = BaseRegex.GetStringXmlByRegs(ref html, "msg");
|
||||
BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3);
|
||||
}
|
||||
url = BaseClass.Build29WxObjString("order/wx_update_transit_order_reject_status");
|
||||
data = UserLogin.GetSignaturex();
|
||||
data += "&order_no=" + orderItem.order_id;
|
||||
data += "&order_sku_id=" + orderItem.sku_id;
|
||||
data += "&has_reject=" + rejectStatus;
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
var transitOrder = orderItem.TransitPackageLatest.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = orderItem.TransitPackageLatest.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = orderItem.TransitPackageLatest.oms_wei_transfer_extra_package;
|
||||
|
||||
orderItem.ItemTransitOrderWithVoid.has_reject = rejectStatus;
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
// 拒收发货包裹
|
||||
if (transitOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == transitOrder.order_code) ?? transitOrder;
|
||||
var rejectRst = await OrderTransitService.RejectTransitOrder(orderItem, transitOrder);
|
||||
if (!string.IsNullOrEmpty(rejectRst))
|
||||
BaseMsgWindow.ShowInfo(rejectRst);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
// 拒收额外包裹(额外包裹暂不支持多件商品发货,故暂不存在拒收功能)
|
||||
else if (extOrder != null)
|
||||
{
|
||||
}
|
||||
|
||||
btnAddEditTransitWarehouseReject_New.IsEnabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnAddEditTransitWarehouseAfterSale_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
//if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
@@ -1345,35 +1143,71 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// transitAfterSaleWindow.ShowDialog();
|
||||
//}
|
||||
|
||||
// 显示状态的按钮,直接返回
|
||||
if (sender == btnAddEditTransitWarehouseAfterSale)
|
||||
return;
|
||||
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
// 显示状态的按钮,直接返回
|
||||
if (sender == btnAddEditTransitWarehouseAfterSale)
|
||||
return;
|
||||
//bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n1;
|
||||
//ShowReturnPackageWindow(orderItem, orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid, isOutWarehouse);
|
||||
|
||||
string warehouse_status = "";
|
||||
if (orderItem.ItemTransitOrder?.warehouse_status == 3 || orderItem.ItemTransitOrder?.warehouse_status == 1)
|
||||
warehouse_status = "已到仓";
|
||||
if (orderItem.ItemTransitOrder?.warehouse_status == 2)
|
||||
warehouse_status = "已出仓";
|
||||
else
|
||||
warehouse_status = "未到仓";
|
||||
btnAddEditTransitWarehouseAfterSale_n1.IsEnabled = false;
|
||||
btnAddEditTransitWarehouseAfterSale_n2.IsEnabled = false;
|
||||
|
||||
if (sender == btnAddEditTransitWarehouseAfterSale_n1)
|
||||
var transitOrder = orderItem.TransitPackageLatest.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = orderItem.TransitPackageLatest.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = orderItem.TransitPackageLatest.oms_wei_transfer_extra_package;
|
||||
|
||||
if (transitOrder != null)
|
||||
{
|
||||
string msg = $@"
|
||||
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n2;
|
||||
ShowReturnPackageWindow(orderItem, orderItem.TransitPackageLatest, isOutWarehouse);
|
||||
}
|
||||
else if (extOrder != null)
|
||||
{
|
||||
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n2;
|
||||
ShowReturnPackageWindow(orderItem, orderItem.TransitPackageLatest, isOutWarehouse);
|
||||
}
|
||||
|
||||
btnAddEditTransitWarehouseAfterSale_n1.IsEnabled = true;
|
||||
btnAddEditTransitWarehouseAfterSale_n2.IsEnabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
public static void ShowReturnPackageWindow(oms_wei_order_item_info orderItem, oms_wei_order_item_transit_detail_info itemTransitInfo, bool isOutWarehouse)
|
||||
{
|
||||
string warehouse_status = "";
|
||||
if (itemTransitInfo?.WarehouseStatus == "拦截到仓")
|
||||
warehouse_status = "已拦截到仓";
|
||||
else if (itemTransitInfo?.WarehouseStatus == "已入库")
|
||||
warehouse_status = "已到仓";
|
||||
else if (itemTransitInfo?.WarehouseStatus == "已出库")
|
||||
warehouse_status = "已出仓";
|
||||
else
|
||||
warehouse_status = "未到仓";
|
||||
|
||||
if (itemTransitInfo.oms_wei_external_procurement_log_info == null && itemTransitInfo.oms_wei_transfer_extra_package == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("未找到发货或者额外包裹,无法转寄/退回包裹");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!isOutWarehouse) /* 未出仓 */
|
||||
{
|
||||
string msg = $@"
|
||||
拒收失败转寄总店({warehouse_status})
|
||||
|
||||
说 明:店铺产生售后,拒收失败(物流信息签收3天
|
||||
内无退回记录),货物需转寄退回总店。
|
||||
收 费:(与退货仓退货价格一样)";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, "拒收失败转寄总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
string msg = $@"
|
||||
if (BaseMsgWindow.ShowConfirm(msg, "拒收失败转寄总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
return;
|
||||
}
|
||||
else /* 已出仓 */
|
||||
{
|
||||
string msg = $@"
|
||||
出库拦截退回仓库({warehouse_status})
|
||||
|
||||
说 明:拦截成功后货物返回云仓,云仓转寄到总店。
|
||||
@@ -1381,13 +1215,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
几率很低,签收需联系用户拒收。
|
||||
收 费:(与退货仓退货价格一样)";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, "出库拦截退回仓库", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
return;
|
||||
}
|
||||
|
||||
TransitAfterSaleWindow transitAfterSaleWindow = new TransitAfterSaleWindow(orderItem);
|
||||
transitAfterSaleWindow.ShowDialog();
|
||||
if (BaseMsgWindow.ShowConfirm(msg, "出库拦截退回仓库", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
return;
|
||||
}
|
||||
|
||||
TransitAfterSaleWindow transitAfterSaleWindow = new TransitAfterSaleWindow(orderItem, itemTransitInfo);
|
||||
transitAfterSaleWindow.ShowDialog();
|
||||
}
|
||||
|
||||
private async void btnAbnormalOrderRebuy_Click(object sender, RoutedEventArgs e)
|
||||
@@ -1488,7 +1321,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 拍单前查询订单是否退款
|
||||
var orderId = orderItem.order_id;
|
||||
var skuId = orderItem.sku_id;
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
@@ -1679,26 +1512,33 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
});
|
||||
}
|
||||
|
||||
static bool CheckIsRefund(oms_wei_order_item_info orderItem)
|
||||
static bool CheckIsRefund(oms_wei_order_item_info orderItem, bool isAutoBuy = false)
|
||||
{
|
||||
if (/*orderItem?.ItemRefund?.count > 0 &&*/ orderItem.refund_status > 1)
|
||||
{
|
||||
MainWindow.Instance.Dispatcher.Invoke(new Action(() =>
|
||||
if (isAutoBuy)
|
||||
{
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
if (shop != null)
|
||||
BaseMsgWindow.ShowAnimateMessage("订单有售后,请去店铺后台退款", "Error", 6);
|
||||
}
|
||||
else
|
||||
{
|
||||
MainWindow.Instance.Dispatcher.Invoke(new Action(() =>
|
||||
{
|
||||
WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
|
||||
shopLoginForm.openType = Work._29Tools.Forms.ShopForms.EnumOpenType.manage;
|
||||
shopLoginForm.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/aftersale/detail?orderid=" + orderItem.ItemRefund.after_sale_order_id;
|
||||
shopLoginForm.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单有售后,请去店铺后台退款");
|
||||
}
|
||||
}));
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
if (shop != null)
|
||||
{
|
||||
WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
|
||||
shopLoginForm.openType = Work._29Tools.Forms.ShopForms.EnumOpenType.manage;
|
||||
shopLoginForm.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/aftersale/detail?orderid=" + orderItem.ItemRefund.after_sale_order_id;
|
||||
shopLoginForm.Show();
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseMsgWindow.ShowError("订单有售后,请去店铺后台退款");
|
||||
}
|
||||
}));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -1786,7 +1626,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
try
|
||||
{
|
||||
var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(orderItem.Shop, orderItem.ItemOrder);
|
||||
var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(orderItem.ItemOrder.Shop, orderItem.ItemOrder);
|
||||
if (rst == "success")
|
||||
{
|
||||
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
|
||||
@@ -1938,7 +1778,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
WXOrderListOptimizeForm form = new WXOrderListOptimizeForm(orderItem.Shop);
|
||||
WXOrderListOptimizeForm form = new WXOrderListOptimizeForm(orderItem.ItemOrder.Shop);
|
||||
form.lblOrderId.Text = orderItem.order_id;
|
||||
form.lblSpuId.Text = orderItem.product_id;
|
||||
form.lblSkuId.Text = orderItem.sku_id; // skuId
|
||||
@@ -2014,55 +1854,54 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
}
|
||||
|
||||
private void btnGetSyncWaybillDetail_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void btnTransitExtraPackages_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
// 不是中转仓,直接返回
|
||||
var transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
|
||||
if (transitOrder == null)
|
||||
// 发货包裹滞留补发
|
||||
if (orderItem.TransitPackageLatest?.oms_wei_external_procurement_log_info != null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("非中转仓订单不支持补发!");
|
||||
return;
|
||||
// 不是中转仓发货包裹,直接返回
|
||||
//var transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
|
||||
var transitOrder = orderItem.TransitPackageLatest?.oms_wei_external_procurement_log_info;
|
||||
if (transitOrder == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("非中转仓订单不支持补发!");
|
||||
return;
|
||||
}
|
||||
|
||||
// string msg = $@"
|
||||
// 滞留补发买家
|
||||
|
||||
//说 明:总店未在90小时到仓导致快递停滞退回, 货物
|
||||
// 滞留云仓,可用补发继续发给买家。
|
||||
//收 费:(与云仓发货价格一样)";
|
||||
// if (BaseMsgWindow.ShowConfirm(msg, "滞留补发买家", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
// return;
|
||||
|
||||
// string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
// decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
// JObject body = new JObject();
|
||||
// body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
// body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
|
||||
// body["packType"] = "2";
|
||||
// body["batchId"] = orderItem.order_id + "-" + DateTime.Now.ToString("yyMMddHHmmss");
|
||||
// body["orderNo"] = orderItem.order_id;
|
||||
// body["orderCode"] = transitOrder.order_code;
|
||||
// body["logisticsCode"] = transitOrder.express_2_company;
|
||||
// body["logisticsExpressCode"] = transitOrder.express_2_waybill;
|
||||
// body["accountUser"] = BaseClass.UserName;
|
||||
// body["purchaserNote"] = "测试订单13017678999";//采购人备注
|
||||
// body["orderPlatformCode"] = "WEISHOP";
|
||||
|
||||
TransitExtraPackagesView transitExtraPackagesView = new TransitExtraPackagesView(orderItem.ItemOrder, orderItem, transitOrder);
|
||||
new DialogWindow()
|
||||
{
|
||||
Title = "滞留补发买家",
|
||||
Content = transitExtraPackagesView,
|
||||
}.ShowDialog();
|
||||
}
|
||||
|
||||
// string msg = $@"
|
||||
// 滞留补发买家
|
||||
|
||||
//说 明:总店未在90小时到仓导致快递停滞退回, 货物
|
||||
// 滞留云仓,可用补发继续发给买家。
|
||||
//收 费:(与云仓发货价格一样)";
|
||||
// if (BaseMsgWindow.ShowConfirm(msg, "滞留补发买家", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
// return;
|
||||
|
||||
// string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
// decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
// JObject body = new JObject();
|
||||
// body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
// body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
|
||||
// body["packType"] = "2";
|
||||
// body["batchId"] = orderItem.order_id + "-" + DateTime.Now.ToString("yyMMddHHmmss");
|
||||
// body["orderNo"] = orderItem.order_id;
|
||||
// body["orderCode"] = transitOrder.order_code;
|
||||
// body["logisticsCode"] = transitOrder.express_2_company;
|
||||
// body["logisticsExpressCode"] = transitOrder.express_2_waybill;
|
||||
// body["accountUser"] = BaseClass.UserName;
|
||||
// body["purchaserNote"] = "测试订单13017678999";//采购人备注
|
||||
// body["orderPlatformCode"] = "WEISHOP";
|
||||
|
||||
|
||||
TransitExtraPackagesView transitExtraPackagesView = new TransitExtraPackagesView(orderItem.ItemOrder, orderItem);
|
||||
new DialogWindow()
|
||||
{
|
||||
Title = "滞留补发买家",
|
||||
Content = transitExtraPackagesView,
|
||||
}.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2090,7 +1929,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
});
|
||||
orderItem.ItemTransitExtraOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
|
||||
//MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2133,16 +1972,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
}
|
||||
|
||||
private async void borderWarehouseStatas_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)
|
||||
{
|
||||
oms_wei_order_item_transit_info transitInfo = new oms_wei_order_item_transit_info()
|
||||
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
|
||||
{
|
||||
OrderItem = orderItem,
|
||||
};
|
||||
|
||||
@@ -23,10 +23,15 @@ public partial class OrderTransitListCtrl : UserControl
|
||||
{
|
||||
OrderTransitListCtrlViewModel ViewModel;
|
||||
|
||||
public OrderTransitListCtrl(oms_wei_order_item_transit_info transitInfo)
|
||||
public OrderTransitListCtrl(oms_wei_order_item_transit_model transitInfo)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
UpdateViewModel(transitInfo);
|
||||
}
|
||||
|
||||
public void UpdateViewModel(oms_wei_order_item_transit_model transitInfo)
|
||||
{
|
||||
ViewModel = new OrderTransitListCtrlViewModel(transitInfo);
|
||||
ViewModel.RequestClose += ViewModel_RequestClose;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ public class OrderTransitListCtrlViewModel : PropertyNotifyObject
|
||||
{
|
||||
private volatile bool _isWindowLoaded = false;
|
||||
|
||||
public oms_wei_order_item_transit_info TransitInfo
|
||||
public oms_wei_order_item_transit_model TransitInfo
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitInfo); }
|
||||
set { this.SetValue(x => x.TransitInfo, value); }
|
||||
@@ -37,7 +37,7 @@ public class OrderTransitListCtrlViewModel : PropertyNotifyObject
|
||||
/// <summary>请求关闭窗口</summary>
|
||||
public event Action RequestClose;
|
||||
|
||||
public OrderTransitListCtrlViewModel(oms_wei_order_item_transit_info transitInfo)
|
||||
public OrderTransitListCtrlViewModel(oms_wei_order_item_transit_model transitInfo)
|
||||
{
|
||||
TransitInfo = transitInfo;
|
||||
OrderItem = transitInfo?.OrderItem;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:wpf="WPFCommon"
|
||||
d:DesignHeight="280"
|
||||
d:DesignWidth="1000"
|
||||
d:DesignWidth="1200"
|
||||
Background="White"
|
||||
mc:Ignorable="d">
|
||||
<UserControl.Resources>
|
||||
@@ -23,15 +23,15 @@
|
||||
<Border
|
||||
MinHeight="50"
|
||||
Margin="5"
|
||||
BorderBrush="SkyBlue"
|
||||
BorderBrush="#8087CEEB"
|
||||
BorderThickness="1"
|
||||
CornerRadius="10">
|
||||
<Grid>
|
||||
<Grid Opacity="{Binding Opacity}">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border Background="LightSkyBlue" CornerRadius="8,8,0,0">
|
||||
<Border Background="#5087CEEB" CornerRadius="8,8,0,0">
|
||||
<StackPanel MinHeight="30" Orientation="Horizontal">
|
||||
<TextBlock
|
||||
Margin="10,0,0,0"
|
||||
@@ -51,6 +51,8 @@
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="发货包裹"
|
||||
FontWeight="Bold"
|
||||
Foreground="{Binding TransitTypeStrColor}"
|
||||
Text="{Binding TransitTypeStr}" />
|
||||
<TextBox
|
||||
VerticalContentAlignment="Center"
|
||||
@@ -68,59 +70,105 @@
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="0.7*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="0.5*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border
|
||||
Margin="0,10"
|
||||
BorderBrush="LightSkyBlue"
|
||||
BorderThickness="0,0,1,0"
|
||||
Opacity="0.5">
|
||||
BorderThickness="0,0,1,0">
|
||||
<wpf:SpacingStackPanel
|
||||
Margin="10,10"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="4">
|
||||
<wpf:TitleContent Title="交易单号:">
|
||||
<wpf:TitleContent Title="交易单号:" Foreground="#FF666666">
|
||||
<TextBox
|
||||
d:Text="371234567890123456"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Foreground="#FF888888"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding WxOrderId}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="买手单号:">
|
||||
<wpf:TitleContent Title="采购账户:" Foreground="#FF666666">
|
||||
<WrapPanel>
|
||||
<TextBox
|
||||
x:Name="txtOutOrderBuyer"
|
||||
d:Text="张三"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Cursor="Hand"
|
||||
Foreground="#AA0000FF"
|
||||
IsReadOnly="True"
|
||||
Tag="{Binding OutBuyerId}"
|
||||
Text="{Binding OutBuyerName}"
|
||||
TextWrapping="Wrap" />
|
||||
<Border
|
||||
x:Name="borderTransitBuyerRefundStatus"
|
||||
Height="auto"
|
||||
MinWidth="30"
|
||||
Margin="2,0,0,0"
|
||||
HorizontalAlignment="Center"
|
||||
d:Background="{StaticResource PageOkBrush}"
|
||||
d:BorderBrush="{StaticResource PageOkBrush}"
|
||||
Background="{Binding TransitDetailRefundStatusBackColor}"
|
||||
BorderBrush="{Binding TransitDetailRefundStatusBackColor}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="2"
|
||||
Visibility="{Binding TransitDetailRefundStatusStrVisibility}">
|
||||
<TextBlock
|
||||
x:Name="txtRefundStatus"
|
||||
MinWidth="20"
|
||||
Padding="0"
|
||||
VerticalAlignment="Center"
|
||||
d:Text="退货成功"
|
||||
Background="Transparent"
|
||||
Foreground="White"
|
||||
Text="{Binding TransitDetailRefundStatusStr}" />
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="采购单号:" Foreground="#FF666666">
|
||||
|
||||
<TextBox
|
||||
x:Name="txtOutOrderId"
|
||||
d:Text="261008-1234567890123456"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Cursor="Hand"
|
||||
Foreground="#AA0000FF"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding OutOrderId}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="下单时间:">
|
||||
<wpf:TitleContent Title="下单时间:" Foreground="#FF666666">
|
||||
<TextBox
|
||||
d:Text="26-10-07 10:33:33"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Foreground="#FF888888"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding WxOrderCreateTimeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="添加时间:">
|
||||
<wpf:TitleContent Title="添加时间:" Foreground="#FF666666">
|
||||
<TextBox
|
||||
d:Text="26-10-07 18:33:33"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Foreground="#FF888888"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding TransitAddTimeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
</wpf:TitleContent>
|
||||
<wpf:TitleContent Title="创建时间:">
|
||||
<wpf:TitleContent Title="创建时间:" Foreground="#FF666666">
|
||||
<TextBox
|
||||
d:Text="26-10-08 00:33:33"
|
||||
Background="Transparent"
|
||||
BorderThickness="0"
|
||||
Foreground="#FF888888"
|
||||
IsReadOnly="True"
|
||||
Text="{Binding CreateTimeStr}"
|
||||
TextWrapping="Wrap" />
|
||||
@@ -284,6 +332,79 @@
|
||||
</wpf:TitleContent>
|
||||
</wpf:SpacingStackPanel>
|
||||
</Border>
|
||||
<Border Grid.Column="4">
|
||||
<wpf:SpacingStackPanel
|
||||
Grid.Column="8"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical"
|
||||
VerticalSpacing="5">
|
||||
<Button
|
||||
x:Name="btnVoidPackage"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="2"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnVoidPackage_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding VoidPackageBtnVisibility}">
|
||||
作废包裹
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseReject_New"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="2"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnAddEditTransitWarehouseReject_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding RejectPackageBtnVisibility}">
|
||||
<!--<TextBlock>
|
||||
云仓拒收<LineBreak />
|
||||
退回总店</TextBlock>-->
|
||||
云仓拒收退回总店
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="2"
|
||||
Click="btnAddEditTransitWarehouseAfterSale_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ReturnPackageBtnVisibility}">
|
||||
拒收失败转寄总店
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
|
||||
MinWidth="38"
|
||||
MinHeight="20"
|
||||
Margin="0,0,0,0"
|
||||
Padding="2"
|
||||
Click="btnAddEditTransitWarehouseAfterSale_Click"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding InterceptPackageBtnVisibility}">
|
||||
出库拦截退回仓库
|
||||
</Button>
|
||||
<Button
|
||||
x:Name="btnTransitExtraPackages"
|
||||
Height="20"
|
||||
MinWidth="38"
|
||||
Margin="0,0,0,0"
|
||||
Padding="2"
|
||||
HorizontalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
Click="btnTransitExtraPackages_Click"
|
||||
Content="滞留补发买家"
|
||||
FontSize="11"
|
||||
Style="{StaticResource BasePageButtonLightStyle}"
|
||||
Visibility="{Binding ExtraPackagesBtnVisibility}" />
|
||||
</wpf:SpacingStackPanel>
|
||||
</Border>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
using System;
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.Views;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.DBModel;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
@@ -12,6 +19,9 @@ using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using Work;
|
||||
using Work._29Tools.BLL;
|
||||
using WxOrder.Framework.Commons;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
|
||||
@@ -23,5 +33,214 @@ public partial class OrderTransitListDetailCtrl : UserControl
|
||||
public OrderTransitListDetailCtrl()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
this.txtOutOrderId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderId_MouseLeftButtonUp), true);
|
||||
this.txtOutOrderBuyer.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderId_MouseLeftButtonUp), true);
|
||||
}
|
||||
|
||||
/// <summary> 作废包裹 </summary>
|
||||
private async void btnVoidPackage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
|
||||
{
|
||||
btnVoidPackage.IsEnabled = false;
|
||||
var orderItem = transitDetailInfo.oms_wei_order_item_info;
|
||||
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
|
||||
|
||||
// 作废发货包裹
|
||||
if (transitOrder != null)
|
||||
{
|
||||
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == transitOrder.order_code) ?? transitOrder;
|
||||
await OrderTransitService.VoidOrder(orderItem, transitOrder);
|
||||
}
|
||||
// 作废退货包裹
|
||||
else if (returnOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
var voidResult = await OrderTransitService.VoidAfterSalePackage(orderItem, returnOrder);
|
||||
if (!string.IsNullOrEmpty(voidResult))
|
||||
BaseMsgWindow.ShowInfo(voidResult);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
// 作废额外包裹
|
||||
else if (extOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
var voidResult = await OrderTransitService.VoidExtraPackage(orderItem, extOrder);
|
||||
if (!string.IsNullOrEmpty(voidResult))
|
||||
BaseMsgWindow.ShowInfo(voidResult);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
RefreshListCtrl(orderItem);
|
||||
btnVoidPackage.IsEnabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary> 拒收包裹 </summary>
|
||||
private async void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
|
||||
{
|
||||
btnAddEditTransitWarehouseReject_New.IsEnabled = false;
|
||||
|
||||
var orderItem = transitDetailInfo.oms_wei_order_item_info;
|
||||
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
|
||||
|
||||
// 拒收发货包裹
|
||||
if (transitOrder != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
var rejectRst = await OrderTransitService.RejectTransitOrder(orderItem, transitOrder);
|
||||
if (!string.IsNullOrEmpty(rejectRst))
|
||||
BaseMsgWindow.ShowInfo(rejectRst);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
BaseMsgWindow.ShowError(ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
// 拒收额外包裹(额外包裹暂不支持多件商品发货,故暂不存在拒收功能)
|
||||
else if (extOrder != null)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
RefreshListCtrl(orderItem);
|
||||
btnAddEditTransitWarehouseReject_New.IsEnabled = true;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void btnAddEditTransitWarehouseAfterSale_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
|
||||
{
|
||||
btnAddEditTransitWarehouseAfterSale_n1.IsEnabled = false;
|
||||
btnAddEditTransitWarehouseAfterSale_n2.IsEnabled = false;
|
||||
|
||||
var orderItem = transitDetailInfo.oms_wei_order_item_info;
|
||||
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
|
||||
|
||||
if (transitOrder != null)
|
||||
{
|
||||
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n2;
|
||||
OrderListRowItemCtrl.ShowReturnPackageWindow(orderItem, transitDetailInfo, isOutWarehouse);
|
||||
}
|
||||
else if (extOrder != null)
|
||||
{
|
||||
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n2;
|
||||
OrderListRowItemCtrl.ShowReturnPackageWindow(orderItem, transitDetailInfo, isOutWarehouse);
|
||||
}
|
||||
|
||||
RefreshListCtrl(orderItem);
|
||||
btnAddEditTransitWarehouseAfterSale_n1.IsEnabled = true;
|
||||
btnAddEditTransitWarehouseAfterSale_n2.IsEnabled = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnTransitExtraPackages_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
// 滞留补发买家(补发包裹)
|
||||
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
|
||||
{
|
||||
var orderItem = transitDetailInfo.oms_wei_order_item_info;
|
||||
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
|
||||
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
|
||||
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
|
||||
|
||||
if (transitOrder != null)
|
||||
{
|
||||
// 不是中转仓,直接返回
|
||||
if (transitOrder == null)
|
||||
{
|
||||
BaseMsgWindow.ShowError("非中转仓订单不支持补发!");
|
||||
return;
|
||||
}
|
||||
|
||||
TransitExtraPackagesView transitExtraPackagesView = new TransitExtraPackagesView(orderItem.ItemOrder, orderItem, transitOrder);
|
||||
new DialogWindow()
|
||||
{
|
||||
Title = "滞留补发买家",
|
||||
Content = transitExtraPackagesView,
|
||||
}.ShowDialog();
|
||||
}
|
||||
|
||||
RefreshListCtrl(orderItem);
|
||||
}
|
||||
}
|
||||
|
||||
public void RefreshListCtrl(oms_wei_order_item_info orderItem)
|
||||
{
|
||||
// 更新列表
|
||||
if (FindParent<OrderTransitListCtrl>(this) is OrderTransitListCtrl transitListCtrl)
|
||||
{
|
||||
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),
|
||||
};
|
||||
transitListCtrl.UpdateViewModel(transitInfo);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查找指定类型的父级控件
|
||||
/// </summary>
|
||||
/// <typeparam name="T">目标父控件类型</typeparam>
|
||||
/// <param name="child">起始子控件</param>
|
||||
/// <returns>找到的父控件,未找到则返回 null</returns>
|
||||
public static T FindParent<T>(DependencyObject child) where T : DependencyObject
|
||||
{
|
||||
DependencyObject parentObject = VisualTreeHelper.GetParent(child);
|
||||
|
||||
if (parentObject == null) return null;
|
||||
|
||||
if (parentObject is T parent)
|
||||
{
|
||||
return parent;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 递归继续向上查找
|
||||
return FindParent<T>(parentObject);
|
||||
}
|
||||
}
|
||||
|
||||
private void txtOutOrderId_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo && transitDetailInfo.oms_wei_order_item_info is oms_wei_order_item_info orderItem)
|
||||
{
|
||||
var buyerId = txtOutOrderBuyer.Tag as string;
|
||||
var buyerName = txtOutOrderBuyer.Text;
|
||||
var outOrderId = txtOutOrderId.Text;
|
||||
if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
bool isShowOrderList = sender == txtOutOrderBuyer;
|
||||
|
||||
OrderBuyerOrdersHelper.ShowBuyerOrder(orderItem, buyerId, buyerName, outOrderId, isShowOrderList);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,351 @@
|
||||
using _29WxOrderWpf.BaseWindows;
|
||||
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||
using _29WxOrderWpf.ViewModels;
|
||||
using _29WxOrderWpf.Views;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.DBModel;
|
||||
using AllBase.Model.Result;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Work;
|
||||
using Work._29Tools.BLL;
|
||||
using WxOrder.Framework.Commons;
|
||||
|
||||
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
|
||||
|
||||
internal class OrderTransitService
|
||||
{
|
||||
/// <summary>
|
||||
/// 作废中转仓发货包裹
|
||||
/// </summary>
|
||||
/// <param name="orderItem"></param>
|
||||
/// <param name="isSilent"></param>
|
||||
/// <param name="UpdateOrderBeforeVoid">作废前是否更新服务端订单状态</param>
|
||||
public static async Task VoidOrder(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info transitOrder = null, bool isSilent = false, bool UpdateOrderBeforeVoid = true)
|
||||
{
|
||||
if (!isSilent)
|
||||
{
|
||||
if (BaseMsgWindow.ShowConfirm("确定作废当前包裹吗?").DialogResult == false)
|
||||
return;
|
||||
}
|
||||
|
||||
// 作废前查询订单状态
|
||||
var orderId = orderItem.order_id;
|
||||
var skuId = orderItem.sku_id;
|
||||
if (UpdateOrderBeforeVoid)
|
||||
await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(orderId); });
|
||||
|
||||
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
|
||||
if (newOrder?.orderItems.Count == 1)
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault();
|
||||
else
|
||||
orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
|
||||
|
||||
if (orderItem == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("订单查询失败,请重试");
|
||||
return;
|
||||
}
|
||||
if (transitOrder == null)
|
||||
transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
|
||||
|
||||
if (transitOrder == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("要作废的中转订单不存在,请确认后重试");
|
||||
return;
|
||||
}
|
||||
|
||||
// 先作废后申请买手退款
|
||||
// 订单作废接口(作废重拍)
|
||||
//postman request POST 'http://localhost:8088/oms-api/external_procurement/discardOrder' \
|
||||
// --header 'Content-Type: application/json' \
|
||||
// --body '{
|
||||
// "orderNo":"12334534534",
|
||||
// "outOrderNo":"12312312"
|
||||
//}' 成功返回code:0 失败返回code:1
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
|
||||
var data2 = new JObject();
|
||||
data2["orderNo"] = orderItem.order_id;
|
||||
//data2["outOrderNo"] = transitOrder.out_order_no;
|
||||
data2["outOrderNo"] = transitOrder.order_code;
|
||||
var dataStr2 = JsonHelper.SerializeObject(data2);
|
||||
var discardRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
|
||||
if (discardRst.Contains("\"code\":0") || discardRst.Contains("\"code\":200"))
|
||||
{
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(orderId);
|
||||
// 修改为在买手退款流程后提示作废信息
|
||||
}
|
||||
else
|
||||
{
|
||||
var msg = BaseRegex.GetStringJsonByRegs(ref discardRst, discardRst, "msg");
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#region 处理买手售后
|
||||
if (transitOrder.out_order_no.ParseToString().StartsWith("tb_")) // 淘宝买手售后
|
||||
{
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowError("淘宝买手暂不支持自动售后,作废后请手动申请售后");
|
||||
else
|
||||
transitOrder.refund_status = "淘宝买手暂不支持自动售后,作废后需手动申请售后";
|
||||
}
|
||||
else // 拼多多买手售后
|
||||
{
|
||||
bool noBuyer = false;
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account || b.buyer_name == transitOrder.buyer_account);
|
||||
if (buyer == null)
|
||||
{
|
||||
if (!isSilent)
|
||||
if (BaseMsgWindow.ShowConfirm("拍单买手不存在,点击确定直接作废中转单并手动取消买手单,点击取消登录买手后重试").DialogResult != true)
|
||||
return;
|
||||
noBuyer = true;
|
||||
}
|
||||
|
||||
// 检测一下买手号
|
||||
if (GlobalConfig.CurrentPddBuyer.status == "在线")
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
PddMobileLoginViewModel.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
|
||||
});
|
||||
}
|
||||
if (GlobalConfig.CurrentPddBuyer.status != "在线")
|
||||
{
|
||||
if (!isSilent)
|
||||
if (BaseMsgWindow.ShowConfirm("买手号掉线,点击确定直接作废中转单并手动取消买手单,点击取消登录买手后重试").DialogResult != true)
|
||||
return;
|
||||
noBuyer = true;
|
||||
}
|
||||
|
||||
if (!noBuyer)
|
||||
{
|
||||
PddBuyerOrderLiteInfo order = null;
|
||||
order = PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite.FirstOrDefault(o => o.order_sn == transitOrder.out_order_no);
|
||||
if (order == null)
|
||||
order = new PddBuyerOrderLiteInfo()
|
||||
{
|
||||
order_status_prompt = "待发货",
|
||||
order_amount = transitOrder.out_amount,
|
||||
order_sn = transitOrder.out_order_no
|
||||
};
|
||||
PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite.Add(order);
|
||||
|
||||
var pddAfterRst = "";
|
||||
await Task.Run(() =>
|
||||
{
|
||||
pddAfterRst = PDDBuyerOrderReadCtrl.SimPddAfterSale(buyer, order);
|
||||
});
|
||||
|
||||
if (pddAfterRst.Contains("\"after_sales_status\":1") || pddAfterRst.Contains("该订单已全额退款") || pddAfterRst.Contains("订单未付款"))
|
||||
{
|
||||
// 保存退款成功状态
|
||||
order.order_status_prompt = pddAfterRst.Contains("订单未付款") ? "订单未付款" : "退款成功";
|
||||
// 中转仓订单买手号售后信息 存到服务端
|
||||
var refundRst = PDDBuyerOrderReadCtrl.SendTransitAfterSaleE57(order);
|
||||
if (refundRst.Contains("<code>0</code>") || refundRst.Contains("<code>200</code>"))
|
||||
{
|
||||
order.sendStatus = "退款成功 买手退款信息更新成功";
|
||||
}
|
||||
else
|
||||
{
|
||||
var msg = BaseRegex.GetStringXml(ref refundRst, "msg");
|
||||
order.sendStatus = "退款成功 买手退款信息更新失败,服务端返回 " + msg;
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!isSilent)
|
||||
if (BaseMsgWindow.ShowConfirm("买手退款失败,点击确定直接作废中转单并手动取消买手单,点击取消稍候重试").DialogResult != true)
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 更新拍单余额
|
||||
StartUp.UpdateBalance();
|
||||
#endregion
|
||||
|
||||
#region 立即更新订单
|
||||
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == transitOrder.order_code) ?? transitOrder;
|
||||
transitOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
#endregion
|
||||
|
||||
#region 重新过滤订单
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
MainWindow.Instance.orderListCtrl.FilterOrders();
|
||||
if (!isSilent)
|
||||
BaseMsgWindow.ShowInfo("订单作废成功,请重新拍单");
|
||||
#endregion
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 作废售后包裹
|
||||
/// </summary>
|
||||
/// <param name="returnOrder"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<string> VoidAfterSalePackage(oms_wei_order_item_info orderItem, oms_wei_external_procurement_after_sale_info returnOrder)
|
||||
{
|
||||
string typeStr = returnOrder?.pack_type == 1 ? "作废分销发货退货包裹" : "作废额外包裹退货包裹";
|
||||
string msg = $@"确定{typeStr}吗?";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, typeStr, null, MsgWindowLevel.MEDIUM, 300).DialogResult != true)
|
||||
return "";
|
||||
|
||||
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/interceptReturn";
|
||||
var data = new JObject();
|
||||
data["externalOrderNo"] = returnOrder.external_order_no;
|
||||
data["orderNo"] = returnOrder.order_no; // 订单编号
|
||||
data["orderCode"] = returnOrder.order_code;
|
||||
data["packType"] = returnOrder.pack_type; /* 1作废分销发货退货包裹 2作废额外包裹退货包裹 */
|
||||
var dataStr2 = JsonHelper.SerializeObject(data);
|
||||
var voidRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
|
||||
|
||||
if (voidRst.Contains("\"code\":0") || voidRst.Contains("\"code\":200"))
|
||||
{
|
||||
StartUp.UpdateBalance();
|
||||
returnOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
return typeStr + "成功!";
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception(typeStr + "失败,服务端返回:" + BaseRegex.GetStringJsonByRegs(ref voidRst, voidRst, "msg"));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 作废额外包裹
|
||||
/// </summary>
|
||||
/// <param name="orderItem"></param>
|
||||
/// <param name="extraOrder"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
public static async Task<string> VoidExtraPackage(oms_wei_order_item_info orderItem, oms_wei_transfer_extra_package extraOrder)
|
||||
{
|
||||
string typeStr = "作废额外包裹";
|
||||
string msg = $@"确定{typeStr}吗?";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, typeStr, null, MsgWindowLevel.MEDIUM, 300).DialogResult != true)
|
||||
return "";
|
||||
|
||||
var data = new JObject();
|
||||
data["batchId"] = extraOrder.batchId;
|
||||
data["orderCode"] = extraOrder.order_code;
|
||||
var dataStr = JsonHelper.SerializeObject(data);
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extraOrders/void";
|
||||
var voidRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
|
||||
if (BaseRegex.GetStringJson(ref voidRst, "code") != "0" && BaseRegex.GetStringJson(ref voidRst, "code") != "200")
|
||||
{
|
||||
throw new Exception("作废额外包裹失败,服务端返回:" + BaseRegex.GetStringJsonByRegs(ref voidRst, voidRst, "msg"));
|
||||
}
|
||||
StartUp.UpdateBalance();
|
||||
extraOrder.order_void_status = 1;
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
//MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
|
||||
return "作废额外包裹成功!";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 云仓申请拒收退回总店
|
||||
/// </summary>
|
||||
/// <param name="orderItem"></param>
|
||||
public static async Task<string> RejectTransitOrder(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info _itemTransitOrder)
|
||||
{
|
||||
string msg = $@"
|
||||
云仓拒收退回总店
|
||||
|
||||
说 明:店铺产生售后,拒收成功,货物会原物流退回总店。
|
||||
拒收条件:(总店物流没到云仓/未签收前)。顺丰/京东无法
|
||||
拒收,直接总店申请仅退款让总店拦截。
|
||||
收 费:免费";
|
||||
|
||||
if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
|
||||
return "";
|
||||
|
||||
orderItem.ItemTransitOrders = await OrderGetOrderListHelper.GetTransitWarehouseList(orderItem.order_id);
|
||||
orderItem.PddBuyerOrders = (await OrderGetOrderListHelper.GetPddBuyerOrders(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);
|
||||
|
||||
var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no);
|
||||
if (itemTransitOrder == null)
|
||||
itemTransitOrder = _itemTransitOrder;
|
||||
|
||||
//if (itemTransitOrder?.warehouse_status == 3) { BaseMsgWindow.ShowError("商品已拒收或拦截!"); return; }
|
||||
//if (itemTransitOrder?.warehouse_status == 2) { BaseMsgWindow.ShowError("商品已出库,请选择退回中转仓!"); return; }
|
||||
//if (string.IsNullOrEmpty(orderItem.PddBuyerOrder?.order_sn)) { BaseMsgWindow.ShowError("商品未出单,请直接去拼多多买手申请退款"); return; }
|
||||
if (itemTransitOrder?.has_reject == 1 || itemTransitOrder?.has_reject == 3)
|
||||
{
|
||||
//BaseMsgWindow.ShowAnimateMessage("已申请拒收", "Msg", 3);
|
||||
return "已申请过拒收";
|
||||
}
|
||||
|
||||
// 中转仓拒收(已产生物流)
|
||||
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/rejectApply";
|
||||
var dataObj = new JObject();
|
||||
dataObj["orderCode"] = itemTransitOrder?.order_code;
|
||||
dataObj["orderId"] = orderItem.order_id;
|
||||
dataObj["logisticsExpressCode"] = orderItem.PddBuyerOrder?.order_sn;
|
||||
var data = JsonHelper.SerializeObject(dataObj);
|
||||
var html = HttpResponseWXBLL.e57PostResponse(url, data, "");
|
||||
int rejectStatus = 0;
|
||||
if (html.Contains("<code>0</code>") || html.Contains("<code>200</code>"))
|
||||
{
|
||||
rejectStatus = 1;
|
||||
//BaseMsgWindow.ShowAnimateMessage("申请成功", "Msg", 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
rejectStatus = 2;
|
||||
var err = BaseRegex.GetStringXmlByRegs(ref html, html, "msg");
|
||||
//BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3);
|
||||
throw new Exception("申请失败" + err);
|
||||
}
|
||||
url = BaseClass.Build29WxObjString("order/wx_update_transit_order_reject_status");
|
||||
data = UserLogin.GetSignaturex();
|
||||
data += "&order_no=" + orderItem.order_id;
|
||||
data += "&order_sku_id=" + orderItem.sku_id;
|
||||
data += "&has_reject=" + rejectStatus;
|
||||
html = await GetHtml.PostUtf8Async(url, data);
|
||||
|
||||
itemTransitOrder.has_reject = rejectStatus;
|
||||
OrderListCtrl.InitOrderItemObservableProp(orderItem);
|
||||
|
||||
return "申请成功";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 申请拒收后查询拒收状态
|
||||
/// </summary>
|
||||
/// <param name="orderItem"></param>
|
||||
/// <param name="upperWaybill"></param>
|
||||
public static void ShowRejectTransitOrder(oms_wei_order_item_info orderItem, string upperWaybill)
|
||||
{
|
||||
BaiduGetWaybillInfoView buyerLoginForm = new BaiduGetWaybillInfoView(orderItem);
|
||||
buyerLoginForm.ViewModel.InitUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + upperWaybill;
|
||||
|
||||
new DialogWindow()
|
||||
{
|
||||
Width = 1280,
|
||||
Height = 800,
|
||||
Title = "物流拒收查询",
|
||||
Content = buyerLoginForm,
|
||||
}.Show();
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1,51 +1,96 @@
|
||||
<Window
|
||||
x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:vm="[vm ]clr-namespace:_29WxOrderWpf.ViewModels"
|
||||
xmlns:wpf="WPFCommon"
|
||||
Title="设置"
|
||||
Width="800"
|
||||
Height="450"
|
||||
d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}"
|
||||
ResizeMode="NoResize"
|
||||
ShowInTaskbar="False"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
WindowState="Normal"
|
||||
mc:Ignorable="d">
|
||||
<Border BorderBrush="#e8eaed" BorderThickness="1">
|
||||
<TabControl
|
||||
ItemContainerStyle="{StaticResource SideTabItem}"
|
||||
Style="{StaticResource SideTabControl}"
|
||||
TabStripPlacement="Left">
|
||||
x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:vm="clr-namespace:_29WxOrderWpf.ViewModels"
|
||||
xmlns:wpf="WPFCommon"
|
||||
Title="设置"
|
||||
Width="800"
|
||||
Height="450"
|
||||
d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}"
|
||||
ResizeMode="NoResize"
|
||||
ShowInTaskbar="False"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
WindowState="Normal"
|
||||
mc:Ignorable="d">
|
||||
<Border BorderBrush="#e8eaed" BorderThickness="1">
|
||||
<TabControl
|
||||
ItemContainerStyle="{StaticResource SideTabItem}"
|
||||
Style="{StaticResource SideTabControl}"
|
||||
TabStripPlacement="Left">
|
||||
|
||||
<TabItem Header="发货">
|
||||
<StackPanel>
|
||||
<Border Style="{StaticResource SettingRow}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource SettingTitle}" Text="礼品单发送" />
|
||||
<TextBlock Style="{StaticResource SettingDesc}" Text="超出6元自动改为礼品二(实物)" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
<TabItem Header="拍单">
|
||||
<StackPanel>
|
||||
<Border Style="{StaticResource SettingRow}">
|
||||
<Grid Visibility="{Binding ShowEnablePddTransitTraditionalAddress}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource SettingTitle}" Text="云仓拍单" />
|
||||
<TextBlock Style="{StaticResource SettingDesc}" Text="多多云仓拍单随机繁体详细地址" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
Grid.Column="1"
|
||||
VerticalAlignment="Center"
|
||||
IsChecked="{Binding AutoSwitchGiftType}"
|
||||
d:Visibility="Visible"
|
||||
IsChecked="{Binding SwitchEnablePddTransitTraditionalAddress}"
|
||||
Style="{StaticResource ToggleSwitch}" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border Style="{StaticResource SettingRow}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource SettingTitle}" Text="直发拍单" />
|
||||
<TextBlock Style="{StaticResource SettingDesc}" Text="允许直发拍单" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
Grid.Column="1"
|
||||
VerticalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
IsChecked="{Binding SwitchEnableDirectBuy}"
|
||||
Style="{StaticResource ToggleSwitch}" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
|
||||
<!-- ========== 外观 ========== -->
|
||||
<!--
|
||||
<TabItem Header="发货">
|
||||
<StackPanel>
|
||||
<Border Style="{StaticResource SettingRow}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock Style="{StaticResource SettingTitle}" Text="礼品单发送" />
|
||||
<TextBlock Style="{StaticResource SettingDesc}" Text="超出6元自动改为礼品二(实物)" />
|
||||
</StackPanel>
|
||||
<CheckBox
|
||||
Grid.Column="1"
|
||||
VerticalAlignment="Center"
|
||||
d:Visibility="Visible"
|
||||
IsChecked="{Binding AutoSwitchGiftType}"
|
||||
IsEnabled="False"
|
||||
Opacity="0.5"
|
||||
Style="{StaticResource ToggleSwitch}"
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
|
||||
<!-- ========== 外观 ========== -->
|
||||
<!--
|
||||
<TabItem Header="外观" Tag="🎨">
|
||||
<StackPanel
|
||||
MaxWidth="720"
|
||||
@@ -110,8 +155,8 @@
|
||||
</TabItem>
|
||||
|
||||
-->
|
||||
<!-- ========== 账户 ========== -->
|
||||
<!--
|
||||
<!-- ========== 账户 ========== -->
|
||||
<!--
|
||||
<TabItem Header="账户" Tag="👤">
|
||||
<StackPanel
|
||||
MaxWidth="720"
|
||||
@@ -157,8 +202,8 @@
|
||||
</TabItem>
|
||||
|
||||
-->
|
||||
<!-- ========== 隐私 ========== -->
|
||||
<!--
|
||||
<!-- ========== 隐私 ========== -->
|
||||
<!--
|
||||
<TabItem Header="隐私" Tag="🔒">
|
||||
<StackPanel
|
||||
MaxWidth="720"
|
||||
@@ -208,8 +253,8 @@
|
||||
</TabItem>
|
||||
|
||||
-->
|
||||
<!-- ========== 关于 ========== -->
|
||||
<!--
|
||||
<!-- ========== 关于 ========== -->
|
||||
<!--
|
||||
<TabItem Header="关于" Tag="{StaticResource txt-table_stack_above}">
|
||||
<StackPanel
|
||||
MaxWidth="720"
|
||||
@@ -247,6 +292,6 @@
|
||||
</StackPanel>
|
||||
</TabItem>-->
|
||||
|
||||
</TabControl>
|
||||
</Border>
|
||||
</TabControl>
|
||||
</Border>
|
||||
</Window>
|
||||
@@ -1,5 +1,6 @@
|
||||
using _29WxOrderWpf.ViewModels;
|
||||
using AllBase;
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.Config;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
@@ -44,6 +45,15 @@ public partial class SettingsView : Window
|
||||
var setting = vm.ToConfig();
|
||||
BaseClass.Setting = setting;
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig(SettingViewModel.SettingFileName, JsonConvert.SerializeObject(setting));
|
||||
|
||||
foreach (var order in GlobalConfig.lstOrder)
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@@ -23,6 +23,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
|
||||
/// 空/Null 表示全部店铺(服务层会取全部店铺的 ErpShopId)。
|
||||
/// </summary>
|
||||
public List<string> ShopIds { get; set; }
|
||||
/// <summary>
|
||||
/// 是否统计快递费用
|
||||
/// </summary>
|
||||
public bool StatPackages { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -111,6 +115,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
|
||||
/// 被拒绝金额(分)
|
||||
/// </summary>
|
||||
public long RejectedRefund { get; set; }
|
||||
/// <summary>
|
||||
/// 包裹费用
|
||||
/// </summary>
|
||||
public long PackageAmount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -199,6 +207,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
|
||||
/// </summary>
|
||||
public int UnrefundedAmount { get; set; }
|
||||
|
||||
public long PackageAmount { get; set; }
|
||||
/// <summary>
|
||||
/// 买手订单信息(一个订单号对应多个买手订单)
|
||||
/// </summary>
|
||||
@@ -288,6 +297,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
|
||||
public decimal BuyerRefundSuccessedAmount { get; set; }
|
||||
/// <summary>买手号剩余退款金额(尚未成功退款的金额,元)</summary>
|
||||
public decimal BuyerRefundRemainingAmount => BuyerRefundAmount - BuyerRefundSuccessedAmount;
|
||||
/// <summary>
|
||||
/// 包裹费用
|
||||
/// </summary>
|
||||
public decimal PackageAmount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -355,6 +368,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
|
||||
|
||||
/// <summary>平均利润率(利润 / 采购金额,百分数,如 12.34 表示 12.34%)</summary>
|
||||
public decimal AverageProfitRate { get; set; }
|
||||
/// <summary>
|
||||
/// 包裹费用
|
||||
/// </summary>
|
||||
public decimal PackageAmount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels"
|
||||
xmlns:wpf="WPFCommon"
|
||||
d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,
|
||||
IsDesignTimeCreatable=True}"
|
||||
mc:Ignorable="d">
|
||||
@@ -48,9 +49,9 @@
|
||||
Width="110"
|
||||
Height="32"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderThickness="1"
|
||||
DisplayMemberPath="Text"
|
||||
IsReadOnly="True"
|
||||
BorderThickness="1"
|
||||
ItemsSource="{Binding TimeRangeOptions}"
|
||||
SelectedItem="{Binding SelectedTimeRange, Mode=TwoWay}"
|
||||
Style="{StaticResource RoundedComboBox}" />
|
||||
@@ -60,9 +61,10 @@
|
||||
FontSize="14"
|
||||
Foreground="#666666"
|
||||
Text="日期" />
|
||||
<DatePicker BorderBrush="{StaticResource pageColorBrush}"
|
||||
<DatePicker
|
||||
Height="32"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
SelectedDate="{Binding StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<TextBlock
|
||||
Margin="6,0"
|
||||
@@ -70,9 +72,10 @@
|
||||
FontSize="14"
|
||||
Foreground="#666666"
|
||||
Text="~" />
|
||||
<DatePicker BorderBrush="{StaticResource pageColorBrush}"
|
||||
<DatePicker
|
||||
Height="32"
|
||||
VerticalContentAlignment="Center"
|
||||
BorderBrush="{StaticResource pageColorBrush}"
|
||||
SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<TextBlock
|
||||
Margin="14,0,6,0"
|
||||
@@ -95,6 +98,14 @@
|
||||
ItemsSource="{Binding ShopOptions}"
|
||||
SelectedItem="{Binding SelectedShop, Mode=TwoWay}"
|
||||
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
|
||||
Height="32"
|
||||
Margin="18,0,0,0"
|
||||
|
||||
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
|
||||
decimal buyerRefundAmount = ToYuan(list.Sum(a => a.TotalRefund));
|
||||
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 refundOrderCount = list.Sum(a => a.RefundOrderCount);
|
||||
int totalOrderCount = validOrderCount + refundOrderCount;
|
||||
@@ -128,6 +128,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
BuyerPaymentAmount = buyerPaymentAmount,
|
||||
BuyerRefundAmount = buyerRefundAmount,
|
||||
BuyerRefundSuccessedAmount = buyerRefundSuccessedAmount,
|
||||
PackageAmount = packageAmount
|
||||
};
|
||||
}
|
||||
|
||||
@@ -248,7 +249,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
decimal profit = ToYuan(list.Sum(a => a.ProfitAmount));
|
||||
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
|
||||
int orderCount = list.Sum(a => a.OrderCount);
|
||||
|
||||
decimal packageAmount = ToYuan(list.Sum(a => a.PackageAmount));
|
||||
return new ShopStatisticsItem
|
||||
{
|
||||
ShopName = ResolveShopName(shopId),
|
||||
@@ -260,7 +261,8 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)),
|
||||
Commission = 0m, // 新接口无“达人佣金”字段,保留占位
|
||||
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 由当前时间生成,并发请求有被判重复签名的风险。
|
||||
var summaryStats = await RequestStatsAsync(query, ShopStatsGroupType.Summary);
|
||||
var trend = await RequestTrendAsync(query);
|
||||
|
||||
if (query.StatPackages)
|
||||
{
|
||||
foreach (var item in summaryStats)
|
||||
{
|
||||
item.ProfitAmount -= item.PackageAmount;
|
||||
}
|
||||
}
|
||||
return new ShopRevenueStatisticsResult
|
||||
{
|
||||
Summary = ShopStatsAggregator.GetSummary(summaryStats),
|
||||
@@ -399,7 +407,13 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
|
||||
{
|
||||
// 按天/周/月粒度取数;接口不返回整段汇总,卡片由返回的周期记录在客户端合计
|
||||
var stats = await RequestStatsAsync(query, ToGroupType(periodType));
|
||||
|
||||
if (query.StatPackages)
|
||||
{
|
||||
foreach (var item in stats)
|
||||
{
|
||||
item.ProfitAmount -= item.PackageAmount;
|
||||
}
|
||||
}
|
||||
return new ShopPeriodStatisticsResult
|
||||
{
|
||||
Summary = ShopStatsAggregator.GetSummary(stats),
|
||||
|
||||
@@ -274,30 +274,32 @@
|
||||
</TabItem>
|
||||
</TabControl>
|
||||
<!-- helper -->
|
||||
<Border
|
||||
Margin="0,20,30,0"
|
||||
Padding="10"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
Background="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Cursor="Hand"
|
||||
MouseLeftButtonDown="help_mouseLeftButtonDown">
|
||||
<WrapPanel>
|
||||
<TextBlock
|
||||
Margin="0,0,10,0"
|
||||
Foreground="White"
|
||||
Style="{StaticResource TextBlockIcon}"
|
||||
Text="{StaticResource txt-chat_help}" />
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="Black"
|
||||
Foreground="White"
|
||||
Text="利润计算逻辑" />
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
|
||||
<WrapPanel
|
||||
Margin="0,20,30,0"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top">
|
||||
<Border
|
||||
Padding="10"
|
||||
Background="{StaticResource pageColorBrush}"
|
||||
BorderThickness="1"
|
||||
Cursor="Hand"
|
||||
MouseLeftButtonDown="help_mouseLeftButtonDown">
|
||||
<WrapPanel>
|
||||
<TextBlock
|
||||
Margin="0,0,10,0"
|
||||
Foreground="White"
|
||||
Style="{StaticResource TextBlockIcon}"
|
||||
Text="{StaticResource txt-chat_help}" />
|
||||
<TextBlock
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
FontWeight="Black"
|
||||
Foreground="White"
|
||||
Text="利润计算逻辑" />
|
||||
</WrapPanel>
|
||||
</Border>
|
||||
</WrapPanel>
|
||||
<!-- Popup 弹出层 -->
|
||||
<Popup
|
||||
x:Name="InfoPopup"
|
||||
|
||||
@@ -157,7 +157,11 @@
|
||||
Binding="{Binding ProfitAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}"
|
||||
ElementStyle="{StaticResource CenterCellTextStyle}"
|
||||
Header="利润" />
|
||||
|
||||
<DataGridTextColumn
|
||||
Width="*"
|
||||
Binding="{Binding PackageAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}"
|
||||
ElementStyle="{StaticResource CenterCellTextStyle}"
|
||||
Header="快递费" />
|
||||
<!-- 买手订单:一笔买手订单占一行,不合并 -->
|
||||
<DataGridTextColumn
|
||||
Width="1.6*"
|
||||
|
||||
@@ -166,7 +166,10 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
/// 利润
|
||||
/// </summary>
|
||||
public long ProfitAmount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 包裹费用
|
||||
/// </summary>
|
||||
public long PackageAmount { get; set; }
|
||||
/// <summary>
|
||||
/// 平台佣金
|
||||
/// </summary>
|
||||
@@ -246,6 +249,7 @@ class ShopOrderDetailRow : BindableBaseEx
|
||||
OrderPrice = item.OrderPrice,
|
||||
OrderRefundAmount = item.OrderRefundAmount,
|
||||
ProfitAmount = item.ProfitAmount,
|
||||
PackageAmount = item.PackageAmount,
|
||||
PlatformFee = item.PlatformFee,
|
||||
OutAmount = item.OutAmount,
|
||||
UnrefundedAmount = item.UnrefundedAmount,
|
||||
@@ -411,7 +415,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
bool includeRemark = _detailType == ShopOrderDetailType.BuyerUnrefunded;
|
||||
|
||||
// 表头
|
||||
List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润", "买手单号", "外采金额", "买手退款", "退款状态"];
|
||||
List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润","快递费", "买手单号", "外采金额", "买手退款", "退款状态"];
|
||||
if (includeRemark)
|
||||
headers.Add("备注");
|
||||
sb.AppendLine(string.Join("\t", headers));
|
||||
@@ -428,6 +432,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
|
||||
(item.OrderRefundAmount / 100m).ToString("0.00"),
|
||||
(item.PlatformFee / 100m).ToString("0.00"),
|
||||
(item.ProfitAmount / 100m).ToString("0.00"),
|
||||
(item.PackageAmount / 100m).ToString("0.00"),
|
||||
CsvEscape(item.OutOrderSn),
|
||||
(item.BuyerOutAmount / 100m).ToString("0.00"),
|
||||
(item.BuyerRefundAmount / 100m).ToString("0.00"),
|
||||
|
||||
@@ -177,7 +177,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
#endregion
|
||||
|
||||
#region 查询条件
|
||||
|
||||
public bool StatPackages
|
||||
{
|
||||
get { return this.GetValue(x => x.StatPackages); }
|
||||
set { this.SetValue(x => x.StatPackages, value); }
|
||||
}
|
||||
/// <summary>时间范围选项</summary>
|
||||
public ObservableCollection<TimeRangeOption> TimeRangeOptions { get; }
|
||||
|
||||
@@ -455,20 +459,20 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
EndDate = now;
|
||||
break;
|
||||
case "week":
|
||||
{
|
||||
int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1;
|
||||
StartDate = today.AddDays(-diff);
|
||||
EndDate = now;
|
||||
}
|
||||
break;
|
||||
{
|
||||
int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1;
|
||||
StartDate = today.AddDays(-diff);
|
||||
EndDate = now;
|
||||
}
|
||||
break;
|
||||
case "lastweek":
|
||||
{
|
||||
int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1;
|
||||
var thisWeekStart = today.AddDays(-diff);
|
||||
StartDate = thisWeekStart.AddDays(-7);
|
||||
EndDate = thisWeekStart.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
|
||||
}
|
||||
break;
|
||||
{
|
||||
int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1;
|
||||
var thisWeekStart = today.AddDays(-diff);
|
||||
StartDate = thisWeekStart.AddDays(-7);
|
||||
EndDate = thisWeekStart.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
|
||||
}
|
||||
break;
|
||||
case "last2weeks":
|
||||
StartDate = today.AddDays(-13);
|
||||
EndDate = now;
|
||||
@@ -482,12 +486,12 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
EndDate = now;
|
||||
break;
|
||||
case "lastmonth":
|
||||
{
|
||||
var firstOfThisMonth = new DateTime(today.Year, today.Month, 1);
|
||||
StartDate = firstOfThisMonth.AddMonths(-1);
|
||||
EndDate = firstOfThisMonth.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
|
||||
}
|
||||
break;
|
||||
{
|
||||
var firstOfThisMonth = new DateTime(today.Year, today.Month, 1);
|
||||
StartDate = firstOfThisMonth.AddMonths(-1);
|
||||
EndDate = firstOfThisMonth.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
|
||||
}
|
||||
break;
|
||||
case "last3months":
|
||||
StartDate = new DateTime(today.Year, today.Month, 1).AddMonths(-2);
|
||||
EndDate = now;
|
||||
@@ -541,6 +545,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
StartDate = StartDate,
|
||||
EndDate = EndDate,
|
||||
ShopIds = BuildSelectedShopIds(),
|
||||
StatPackages = StatPackages
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -61,6 +61,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
|
||||
InitializeAsync();
|
||||
}
|
||||
public bool StatPackages
|
||||
{
|
||||
get { return this.GetValue(x => x.StatPackages); }
|
||||
set { this.SetValue(x => x.StatPackages, value); }
|
||||
}
|
||||
|
||||
#region 查询条件
|
||||
|
||||
@@ -288,6 +293,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
StartDate = StartDate,
|
||||
EndDate = EndDate,
|
||||
ShopIds = BuildSelectedShopIds(),
|
||||
StatPackages = StatPackages,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -298,7 +304,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
|
||||
try
|
||||
{
|
||||
var result = await _service.QueryAsync(BuildQuery());
|
||||
|
||||
|
||||
Summary = result.Summary;
|
||||
TrendData = new ObservableCollection<RevenueTrendPoint>(result.Trend ?? new List<RevenueTrendPoint>());
|
||||
ShopProportionData = new ObservableCollection<ShopSalesProportionItem>(result.ShopProportions ?? new List<ShopSalesProportionItem>());
|
||||
|
||||
@@ -7,11 +7,11 @@ using System.Windows;
|
||||
// 有关程序集的一般信息由以下
|
||||
// 控制。更改这些特性值可修改
|
||||
// 与程序集关联的信息。
|
||||
[assembly: AssemblyTitle("29供应连-微信小店订单管理")]
|
||||
[assembly: AssemblyTitle("29供应链-微信小店订单管理")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("29供应连-微信小店订单管理")]
|
||||
[assembly: AssemblyProduct("29供应链-微信小店订单管理")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2026")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
@@ -43,8 +43,9 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
|
||||
giftAmount = 1.55m;
|
||||
}
|
||||
|
||||
if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 1000)
|
||||
if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 100)
|
||||
{
|
||||
giftType = GiftType._160;
|
||||
giftAmount = 1.6m;
|
||||
}
|
||||
decimal amount = giftAmount + BaseClass.OemGiftAmount;
|
||||
|
||||
@@ -23,6 +23,7 @@ namespace _29WxOrderWpf
|
||||
GlobalConfig.BuyConfig = ConfigHelper.LoadConfig<BuyConfig>("buy_config_260708");
|
||||
if (GlobalConfig.BuyConfig == null)
|
||||
GlobalConfig.BuyConfig = new BuyConfig();
|
||||
GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill = false;
|
||||
|
||||
GlobalConfig.lstWXShopTokenInfo = ConfigHelper.LoadConfig<ConcurrentList<WXShopTokenInfo>>("wx_shop_token_list");
|
||||
if (GlobalConfig.lstWXShopTokenInfo == null)
|
||||
@@ -37,7 +38,8 @@ namespace _29WxOrderWpf
|
||||
|
||||
|
||||
BaseClass.Setting = NaiBa.Util.Helper.ConfigHelper.LoadConfig<SettingConfig>(SettingViewModel.SettingFileName);
|
||||
if (BaseClass.Setting==null) BaseClass.Setting = new SettingConfig();
|
||||
if (BaseClass.Setting == null) BaseClass.Setting = new SettingConfig();
|
||||
BaseClass.Setting.AutoSwitchGiftType = true;
|
||||
|
||||
new WxOrder.Framework.Startup();
|
||||
}
|
||||
@@ -59,7 +61,12 @@ namespace _29WxOrderWpf
|
||||
{
|
||||
BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
|
||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||
}
|
||||
|
||||
// 更新下每单扣费金额
|
||||
BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
|
||||
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
|
||||
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -81,7 +81,7 @@ namespace _29WxOrderWpf.ViewModels
|
||||
{
|
||||
IsChangeingPickNo = false;
|
||||
string orderId = OrderItem.order_id;
|
||||
ShopLoginInfo shop = OrderItem.Shop;
|
||||
ShopLoginInfo shop = OrderItem.ItemOrder.Shop;
|
||||
if (string.IsNullOrEmpty(PickNo))
|
||||
{
|
||||
BaseMsgWindow.ShowInfo("取件码不能为空");
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using WPFCommon.Models;
|
||||
|
||||
namespace _29WxOrderWpf.ViewModels;
|
||||
@@ -26,15 +27,35 @@ public class SettingViewModel : BindableBaseEx
|
||||
get => GetValue<bool>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
public bool SwitchEnableDirectBuy
|
||||
{
|
||||
get => GetValue<bool>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
public bool SwitchEnablePddTransitTraditionalAddress
|
||||
{
|
||||
get => GetValue<bool>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
public Visibility ShowEnablePddTransitTraditionalAddress
|
||||
{
|
||||
get => GetValue<Visibility>();
|
||||
set => SetValue(value);
|
||||
}
|
||||
public void Assign(SettingConfig config)
|
||||
{
|
||||
AutoSwitchGiftType = config.AutoSwitchGiftType;
|
||||
SwitchEnableDirectBuy = config.SwitchEnableDirectBuy;
|
||||
SwitchEnablePddTransitTraditionalAddress = config.SwitchEnablePddTransitTraditionalAddress;
|
||||
ShowEnablePddTransitTraditionalAddress = config.ShowEnablePddTransitTraditionalAddress ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
public SettingConfig ToConfig()
|
||||
{
|
||||
return new SettingConfig
|
||||
{
|
||||
AutoSwitchGiftType = AutoSwitchGiftType
|
||||
AutoSwitchGiftType = AutoSwitchGiftType,
|
||||
SwitchEnableDirectBuy = SwitchEnableDirectBuy,
|
||||
SwitchEnablePddTransitTraditionalAddress = SwitchEnablePddTransitTraditionalAddress,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -345,18 +345,20 @@ namespace _29WxOrderWpf.ViewModels
|
||||
|
||||
// cef138必须init后方可设置或删除cookie
|
||||
|
||||
while (!CefWebBrowser.IsBrowserInitialized || !CefWebBrowser.GetBrowser().MainFrame.IsValid)
|
||||
while (_isWindowLoaded && (!CefWebBrowser.IsBrowserInitialized || !CefWebBrowser.GetBrowser().MainFrame.IsValid))
|
||||
await Task.Delay(20);
|
||||
//await WPFCEFBrowser.DeleteCookieAsync(CefWebBrowser.GetCookieManager(null));
|
||||
|
||||
//cef 138 如果没有设置RequestContext 可能为空,直接getCookieManager
|
||||
//await WPFCEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), CefWebBrowser.GetCookieManager(null));
|
||||
if (OpenType != EnumOpenType.login)
|
||||
{
|
||||
foreach (var cook in cookieLst)
|
||||
{
|
||||
await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", CefWebBrowser.GetCookieManager(null));
|
||||
//t.Wait(5000);
|
||||
if (_isWindowLoaded)
|
||||
await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", CefWebBrowser.GetCookieManager(null));
|
||||
}
|
||||
}
|
||||
|
||||
//根据登录的具体店铺设置local storage
|
||||
if (!string.IsNullOrEmpty(buyer?.buyer_id))
|
||||
@@ -369,9 +371,9 @@ namespace _29WxOrderWpf.ViewModels
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(InitUrl))
|
||||
CefWebBrowser.Load(InitUrl);
|
||||
CefWebBrowser?.Load(InitUrl);
|
||||
else
|
||||
CefWebBrowser.Load(buyerMainUrl);
|
||||
CefWebBrowser?.Load(buyerMainUrl);
|
||||
|
||||
//不是登录的话就此返回
|
||||
if (OpenType != EnumOpenType.login)
|
||||
@@ -381,14 +383,14 @@ namespace _29WxOrderWpf.ViewModels
|
||||
|
||||
for (int i = 0; i < 50; i++)
|
||||
{
|
||||
if (CefWebBrowser.IsLoading)
|
||||
if (CefWebBrowser?.IsLoading == true)
|
||||
await Task.Delay(100);
|
||||
}
|
||||
await Task.Delay(Randomx.GetId(1500, 2000));
|
||||
if (!_isWindowLoaded)
|
||||
return;
|
||||
|
||||
while (!CefWebBrowser.Address?.StartsWith(buyerLoginUrl) ?? false)
|
||||
while (!CefWebBrowser?.Address?.StartsWith(buyerLoginUrl) ?? false)
|
||||
{
|
||||
await Task.Delay(1000);
|
||||
if (!_isWindowLoaded)
|
||||
@@ -396,8 +398,7 @@ namespace _29WxOrderWpf.ViewModels
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -426,7 +427,7 @@ namespace _29WxOrderWpf.ViewModels
|
||||
sb.Append("(function(){");
|
||||
sb.Append("CefSharp.BindObjectAsync('shopObj');");
|
||||
sb.Append("})();");
|
||||
CefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString());
|
||||
CefWebBrowser?.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString());
|
||||
}
|
||||
|
||||
private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request)
|
||||
@@ -489,6 +490,8 @@ namespace _29WxOrderWpf.ViewModels
|
||||
{
|
||||
Thread.Sleep(2000);
|
||||
|
||||
if (!_isWindowLoaded)
|
||||
return;
|
||||
//List<Cookie> cookieList = WPFCEFBrowser.GetCookieList(shopCookieHead, CefWebBrowser.GetCookieManager(null));
|
||||
List<Cookie> cookieList = WPFCEFBrowser.GetCookieList("", CefWebBrowser.GetCookieManager(null));
|
||||
|
||||
@@ -555,9 +558,9 @@ namespace _29WxOrderWpf.ViewModels
|
||||
if (CefWebBrowser != null)
|
||||
{
|
||||
if (Address != "about:blank")
|
||||
CefWebBrowser.Load(Address);
|
||||
CefWebBrowser?.Load(Address);
|
||||
else
|
||||
CefWebBrowser.Load(buyerMainUrl);
|
||||
CefWebBrowser?.Load(buyerMainUrl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -40,6 +40,11 @@ namespace _29WxOrderWpf.ViewModels
|
||||
get { return this.GetValue(x => x.OrderItem); }
|
||||
set { this.SetValue(x => x.OrderItem, value); }
|
||||
}
|
||||
public oms_wei_external_procurement_log_info TransitOrder
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitOrder); }
|
||||
set { this.SetValue(x => x.TransitOrder, value); }
|
||||
}
|
||||
public string purchaserNote
|
||||
{
|
||||
get { return this.GetValue(x => x.purchaserNote); }
|
||||
@@ -98,7 +103,12 @@ namespace _29WxOrderWpf.ViewModels
|
||||
|
||||
public void AddExtraPackages()
|
||||
{
|
||||
var transitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
|
||||
if (TransitOrder == null)
|
||||
{
|
||||
//TransitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
|
||||
BaseMsgWindow.ShowError("未找到云仓发货包裹,请确认包裹存在");
|
||||
return;
|
||||
}
|
||||
var transitExtraOrder = OrderItem.ItemTransitExtraOrders.FirstOrDefault(t => t.order_void_status != 1);
|
||||
if (transitExtraOrder != null)
|
||||
{
|
||||
@@ -113,20 +123,20 @@ namespace _29WxOrderWpf.ViewModels
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
|
||||
body["packType"] = "2";
|
||||
body["batchId"] = transitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
|
||||
body["batchId"] = TransitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
|
||||
body["orderNo"] = OrderItem.order_id;
|
||||
body["orderCode"] = transitOrder.order_code;
|
||||
body["orderCode"] = TransitOrder.order_code;
|
||||
|
||||
// 未出库填上游物流,已出库填下游物流
|
||||
if (transitOrder.warehouse_status != 2)
|
||||
if (TransitOrder.warehouse_status != 2)
|
||||
{
|
||||
body["logisticsCode"] = transitOrder.express_1_company;
|
||||
body["logisticsExpressCode"] = transitOrder.express_1_waybill;
|
||||
body["logisticsCode"] = TransitOrder.express_1_company;
|
||||
body["logisticsExpressCode"] = TransitOrder.express_1_waybill;
|
||||
}
|
||||
else
|
||||
{
|
||||
body["logisticsCode"] = transitOrder.express_2_company;
|
||||
body["logisticsExpressCode"] = transitOrder.express_2_waybill;
|
||||
body["logisticsCode"] = TransitOrder.express_2_company;
|
||||
body["logisticsExpressCode"] = TransitOrder.express_2_waybill;
|
||||
}
|
||||
|
||||
body["accountUser"] = BaseClass.UserName;
|
||||
|
||||
@@ -28,11 +28,11 @@ public partial class TransitExtraPackagesView : UserControl
|
||||
/// </summary>
|
||||
public TransitExtraPackagesViewModel ViewModel { get; }
|
||||
|
||||
public TransitExtraPackagesView(oms_wei_order_info _order, oms_wei_order_item_info _orderItem)
|
||||
public TransitExtraPackagesView(oms_wei_order_info _order, oms_wei_order_item_info _orderItem, oms_wei_external_procurement_log_info transitOrder = null)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
ViewModel = new TransitExtraPackagesViewModel(_order, _orderItem);
|
||||
ViewModel = new TransitExtraPackagesViewModel(_order, _orderItem) { TransitOrder = transitOrder };
|
||||
ViewModel.RequestClose += ViewModel_RequestClose;
|
||||
DataContext = ViewModel;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
|
||||
if (!string.IsNullOrEmpty(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 = "用户登录";
|
||||
|
||||
@@ -288,15 +288,15 @@
|
||||
Visibility="Collapsed" />
|
||||
<Button
|
||||
x:Name="btnAdd"
|
||||
Grid.Row="9"
|
||||
Grid.Row="8"
|
||||
Grid.Column="1"
|
||||
MinWidth="48"
|
||||
Padding="4"
|
||||
HorizontalAlignment="Left"
|
||||
Click="btnAdd_Click"
|
||||
Click="btnAddReturnPackage_Click"
|
||||
Content="添 加"
|
||||
IsEnabled="False"
|
||||
Style="{StaticResource BasePageButtonStyle}" />
|
||||
Style="{StaticResource BasePageButtonStyle}" Height="28" Margin="0,53,0,0" Grid.RowSpan="2" VerticalAlignment="Top" />
|
||||
<Image
|
||||
x:Name="imgLoading"
|
||||
Grid.Row="9"
|
||||
|
||||
@@ -29,134 +29,180 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
/// </summary>
|
||||
public partial class TransitAfterSaleWindow : BaseWindow
|
||||
{
|
||||
public int PackType { get; set; }
|
||||
public oms_wei_order_item_info OrderItem { get; set; }
|
||||
public oms_wei_order_item_transit_detail_info TransitInfo { get; set; }
|
||||
public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
|
||||
public oms_wei_transfer_extra_package ExtraPackage { get; set; } = null;
|
||||
|
||||
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem)
|
||||
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem, oms_wei_order_item_transit_detail_info _transitInfo)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
if (orderItem != null)
|
||||
OrderItem = orderItem;
|
||||
}
|
||||
if (_transitInfo != null)
|
||||
TransitInfo = _transitInfo;
|
||||
if (_transitInfo?.oms_wei_external_procurement_log_info != null)
|
||||
TransitOrder = _transitInfo?.oms_wei_external_procurement_log_info;
|
||||
else if (_transitInfo?.oms_wei_transfer_extra_package != null)
|
||||
ExtraPackage = _transitInfo?.oms_wei_transfer_extra_package;
|
||||
PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
|
||||
}
|
||||
|
||||
private void mainGrid_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
btnAdd.IsEnabled = true;
|
||||
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
|
||||
{
|
||||
this.cmbWareHouse.Items.Add(warehouse.TransName);
|
||||
}
|
||||
{
|
||||
this.cmbWareHouse.Items.Add(warehouse.TransName);
|
||||
}
|
||||
|
||||
if (OrderItem != null)
|
||||
{
|
||||
if (TransitOrder == null)
|
||||
if (OrderItem != null && TransitInfo != null)
|
||||
{
|
||||
|
||||
if (ExtraPackage != null)
|
||||
{
|
||||
if (OrderItem.ItemTransitOrder != null)
|
||||
TransitOrder = OrderItem.ItemTransitOrder;
|
||||
else
|
||||
TransitOrder = OrderItem.ItemTransitOrderWithVoid;
|
||||
}
|
||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
|
||||
this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
|
||||
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_waybill : TransitOrder?.express_2_waybill;
|
||||
if (TransitOrder != null && (this.txtExpressName.Text.IsNullOrEmpty() || this.txtWarehouseWaybill.Text.IsNullOrEmpty()))
|
||||
{
|
||||
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
|
||||
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
|
||||
// 获取额外包裹对应的发货包裹或者发货包裹本身
|
||||
var _transitOrder = OrderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == ExtraPackage?.order_code);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.txtExpressName.Text) && !string.IsNullOrWhiteSpace(this.txtWarehouseWaybill.Text))
|
||||
{
|
||||
// 没物流信息的仓库单手动更新买手物流信息
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = TransitOrder?.order_code;
|
||||
data["logisticsExpressCode"] = this.txtWarehouseWaybill.Text;
|
||||
data["logisticsExpressCompany"] = this.txtExpressName.Text;
|
||||
var updateTransitExpressUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/updateLogisticsExpressCode";
|
||||
var updateTransitExpressStr = JsonHelper.SerializeObject(data);
|
||||
var updateTransitExpressRst = HttpResponseWXBLL.e57PostResponse(updateTransitExpressUrl, updateTransitExpressStr, "");
|
||||
}
|
||||
}
|
||||
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.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(ExtraPackage?.real_logistics_express_code) ? ExtraPackage?.logistics_express_code : ExtraPackage?.real_logistics_express_code;
|
||||
|
||||
if (OrderItem.ItemTransitOrderAfterSale != null)
|
||||
{
|
||||
btnAdd.IsEnabled = false;
|
||||
|
||||
this.txtUser.Text = OrderItem.ItemTransitOrderAfterSale.recipient_name;
|
||||
this.txtMobile.Text = OrderItem.ItemTransitOrderAfterSale.recipient_phone;
|
||||
this.txtDetailAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_detail_address;
|
||||
//this.txtAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_province + "/" + OrderItem.ItemTransitOrderAfterSale.refund_city + "/" + OrderItem.ItemTransitOrderAfterSale.refund_county;
|
||||
this.txtProvince.Text = OrderItem.ItemTransitOrderAfterSale.refund_province;
|
||||
this.txtCity.Text = OrderItem.ItemTransitOrderAfterSale.refund_city;
|
||||
this.txtCounty.Text = OrderItem.ItemTransitOrderAfterSale.refund_county;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
(OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货")))
|
||||
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == ExtraPackage.order_code && t.order_void_status != 1 && t.pack_type == PackType);
|
||||
if (transitAfterSale != null)
|
||||
{
|
||||
btnAdd.IsEnabled = false;
|
||||
imgLoading.Visibility = Visibility.Visible;
|
||||
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
|
||||
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
|
||||
if (order != null)
|
||||
{
|
||||
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
if (orderItemTmp != null)
|
||||
OrderItem = orderItemTmp;
|
||||
}
|
||||
btnAdd.IsEnabled = true;
|
||||
}
|
||||
|
||||
if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
|
||||
this.txtUser.Text = transitAfterSale.recipient_name;
|
||||
this.txtMobile.Text = transitAfterSale.recipient_phone;
|
||||
this.txtDetailAddress.Text = transitAfterSale.refund_detail_address;
|
||||
//this.txtAddress.Text = transitAfterSale.refund_province + "/" + transitAfterSale.refund_city + "/" + transitAfterSale.refund_county;
|
||||
this.txtProvince.Text = transitAfterSale.refund_province;
|
||||
this.txtCity.Text = transitAfterSale.refund_city;
|
||||
this.txtCounty.Text = transitAfterSale.refund_county;
|
||||
}
|
||||
else
|
||||
{
|
||||
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
var pddBuyerAfterSale = OrderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == _transitOrder?.out_order_no);
|
||||
|
||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||
if (!string.IsNullOrEmpty(_transitOrder?.out_order_no) && !string.IsNullOrEmpty(pddBuyerAfterSale?.afterSaleAddress) &&
|
||||
(_transitOrder.refund_status.ParseToString().Contains("需手动申请售后") || _transitOrder.refund_status.ParseToString().Contains("待用户发货")))
|
||||
{
|
||||
btnAdd.IsEnabled = false;
|
||||
imgLoading.Visibility = Visibility.Visible;
|
||||
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
|
||||
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
|
||||
if (order != null)
|
||||
{
|
||||
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
if (orderItemTmp != null)
|
||||
OrderItem = orderItemTmp;
|
||||
}
|
||||
btnAdd.IsEnabled = true;
|
||||
}
|
||||
|
||||
pddBuyerAfterSale = OrderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == _transitOrder?.out_order_no);
|
||||
if (!string.IsNullOrEmpty(pddBuyerAfterSale?.afterSaleAddress))
|
||||
{
|
||||
txtAddressAnalysis.Text = pddBuyerAfterSale?.afterSaleAddress;
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
|
||||
// 如果提交过工单,则显示已提交工单及提交时间。
|
||||
var workOrderInfo = await GetWorkOrder();
|
||||
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
|
||||
var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
|
||||
if (!string.IsNullOrEmpty(issueType))
|
||||
else if(TransitOrder != null)
|
||||
{
|
||||
lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")";
|
||||
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
|
||||
this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
|
||||
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_waybill : TransitOrder?.express_2_waybill;
|
||||
if (this.txtExpressName.Text.IsNullOrEmpty() || this.txtWarehouseWaybill.Text.IsNullOrEmpty())
|
||||
{
|
||||
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
|
||||
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.txtExpressName.Text) && !string.IsNullOrWhiteSpace(this.txtWarehouseWaybill.Text))
|
||||
{
|
||||
// 没物流信息的仓库单手动更新买手物流信息
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = TransitOrder?.order_code;
|
||||
data["logisticsExpressCode"] = this.txtWarehouseWaybill.Text;
|
||||
data["logisticsExpressCompany"] = this.txtExpressName.Text;
|
||||
var updateTransitExpressUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/updateLogisticsExpressCode";
|
||||
var updateTransitExpressStr = JsonHelper.SerializeObject(data);
|
||||
var updateTransitExpressRst = HttpResponseWXBLL.e57PostResponse(updateTransitExpressUrl, updateTransitExpressStr, "");
|
||||
}
|
||||
}
|
||||
|
||||
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == TransitOrder.order_code && t.order_void_status != 1 && t.pack_type == PackType);
|
||||
if (transitAfterSale != null)
|
||||
{
|
||||
btnAdd.IsEnabled = false;
|
||||
|
||||
this.txtUser.Text = transitAfterSale.recipient_name;
|
||||
this.txtMobile.Text = transitAfterSale.recipient_phone;
|
||||
this.txtDetailAddress.Text = transitAfterSale.refund_detail_address;
|
||||
//this.txtAddress.Text = transitAfterSale.refund_province + "/" + transitAfterSale.refund_city + "/" + transitAfterSale.refund_county;
|
||||
this.txtProvince.Text = transitAfterSale.refund_province;
|
||||
this.txtCity.Text = transitAfterSale.refund_city;
|
||||
this.txtCounty.Text = transitAfterSale.refund_county;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
|
||||
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
(TransitOrder.refund_status.ParseToString().Contains("需手动申请售后") || TransitOrder.refund_status.ParseToString().Contains("待用户发货")))
|
||||
{
|
||||
btnAdd.IsEnabled = false;
|
||||
imgLoading.Visibility = Visibility.Visible;
|
||||
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
|
||||
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
|
||||
if (order != null)
|
||||
{
|
||||
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
|
||||
if (orderItemTmp != null)
|
||||
OrderItem = orderItemTmp;
|
||||
}
|
||||
btnAdd.IsEnabled = true;
|
||||
}
|
||||
|
||||
if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
|
||||
{
|
||||
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
|
||||
btnAddressAnalysis_Click(null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//if (TransitOrder?.warehouse_status != 0 && TransitOrder?.warehouse_status != 1)
|
||||
//{
|
||||
// btnAdd.IsEnabled = false;
|
||||
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
||||
// lblMsg.Content = "当前订单仓库状态不支持售后,请联系买家直接退回总店!";
|
||||
// return;
|
||||
//}
|
||||
// 如果提交过工单,则显示已提交工单及提交时间。
|
||||
var workOrderInfo = await GetWorkOrder();
|
||||
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
|
||||
var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
|
||||
if (!string.IsNullOrEmpty(issueType))
|
||||
{
|
||||
lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")";
|
||||
}
|
||||
imgLoading.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
if ((TransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||
{
|
||||
//btnAdd.IsEnabled = false;
|
||||
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!";
|
||||
}
|
||||
}
|
||||
|
||||
private void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||
private async void btnAddReturnPackage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString()))
|
||||
{
|
||||
// 后续为独立创建工单
|
||||
// 创建拦截退货包裹工单
|
||||
var workOrder = AddWorkOrder();
|
||||
var workOrder = await AddWorkOrderAsync();
|
||||
if (!workOrder.Contains("\"success\":true"))
|
||||
{
|
||||
BaseMsgWindow.ShowError("中转拦截包裹添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
|
||||
BaseMsgWindow.ShowError("拦截工单添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -177,7 +223,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = TransitOrder?.order_code;
|
||||
data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage?.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */
|
||||
data["refundProvince"] = txtProvince.Text.Trim();
|
||||
data["refundCity"] = txtCity.Text.Trim();
|
||||
data["refundCounty"] = txtCounty.Text.Trim();
|
||||
@@ -186,12 +232,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
data["recipientPhone"] = txtMobile.Text.Trim();
|
||||
data["account_user"] = BaseClass.UserName;
|
||||
data["accountUser"] = BaseClass.UserName;
|
||||
//if (string.IsNullOrWhiteSpace(TransitOrder?.express_1_waybill) && string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) &&
|
||||
// !string.IsNullOrWhiteSpace(txtWarehouseWaybill.Text) && !string.IsNullOrWhiteSpace(txtExpressName.Text.Trim()))
|
||||
//{
|
||||
// data["refundWaybill"] = txtWarehouseWaybill.Text.Trim();
|
||||
// data["returnExpressCompany"] = txtExpressName.Text.Trim();
|
||||
//}
|
||||
data["packType"] = PackType; /* 1正常发货拦截退回,2额外包裹拦截退回, */
|
||||
//data["platform"] = "WEISHOP";
|
||||
|
||||
if (GlobalConfig.BuyConfig.IsUseAppBalance)
|
||||
@@ -206,20 +247,19 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage";
|
||||
var getTransitAfterSaleStr = JsonHelper.SerializeObject(data);
|
||||
var getTransitAfterSaleRst = HttpResponseWXBLL.e57PostResponse(getTransitAfterSaleUrl, getTransitAfterSaleStr, "");
|
||||
if (!getTransitAfterSaleRst.ParseToString().Contains("<code>200</code>") && !getTransitAfterSaleRst.ParseToString().Contains("<code>0</code>"))
|
||||
var getTransitAfterSaleRst = await HttpResponseWXBLL.e57PostResponseAsync(getTransitAfterSaleUrl, getTransitAfterSaleStr);
|
||||
if (!getTransitAfterSaleRst.ParseToString().Contains("\"code\":0") && !getTransitAfterSaleRst.ParseToString().Contains("\"code\":200"))
|
||||
{
|
||||
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = getTransitAfterSaleRst;
|
||||
BaseMsgWindow.ShowError("中转售后添加失败,服务端返回 " + msg, "", this);
|
||||
string msg = BaseRegex.GetStringJsonByRegs(ref getTransitAfterSaleRst, getTransitAfterSaleRst, "msg");
|
||||
BaseMsgWindow.ShowError("拦截退货包裹添加失败,服务端返回 " + msg, "", this);
|
||||
}
|
||||
else
|
||||
{
|
||||
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
Task.Run(() => { MainWindow.Instance.orderListCtrl.FilterOrders(); });
|
||||
BaseMsgWindow.ShowInfo("添加退货包裹成功", "", this);
|
||||
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
//MainWindow.Instance.orderListCtrl.FilterOrders();
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowInfo("添加拦截退货包裹成功", "", this);
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
@@ -279,28 +319,28 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
{
|
||||
}
|
||||
|
||||
public string AddWorkOrder()
|
||||
public async Task<string> AddWorkOrderAsync()
|
||||
{
|
||||
if (TransitOrder?.warehouse_status == 3)
|
||||
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
|
||||
|
||||
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
|
||||
JObject obj = new JObject();
|
||||
obj["appId"] = this.OrderItem.Shop?.ShopId;
|
||||
obj["appId"] = this.OrderItem.ItemOrder?.Shop?.ShopId;
|
||||
obj["wechatOrderNo"] = this.OrderItem.order_id;
|
||||
//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
|
||||
obj["purchaseOrderNo"] = TransitOrder?.order_code;
|
||||
obj["creator"] = BaseClass.UserName;
|
||||
obj["remark"] = "客户要求拦截并退回云仓";
|
||||
|
||||
var rst = HttpResponseTransitWorkOrderBLL.PostResponse(this.OrderItem.Shop, url, JsonHelper.SerializeObject(obj), "");
|
||||
var rst = await HttpResponseTransitWorkOrderBLL.PostResponseAsync(this.OrderItem.ItemOrder?.Shop, url, JsonHelper.SerializeObject(obj), "");
|
||||
return rst;
|
||||
}
|
||||
|
||||
public async Task<string> GetWorkOrder()
|
||||
{
|
||||
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders?wechatOrderNo=" + this.OrderItem.order_id;
|
||||
var rst = await HttpResponseTransitWorkOrderBLL.GetResponseAsync(this.OrderItem.Shop, url, "");
|
||||
var rst = await HttpResponseTransitWorkOrderBLL.GetResponseAsync(this.OrderItem.ItemOrder?.Shop, url, "");
|
||||
return rst;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
@@ -199,7 +199,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
@@ -211,18 +211,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = getTransitAfterSaleRst;
|
||||
BaseMsgWindow.ShowError("中转仓退货订单添加失败,服务端返回 " + msg);
|
||||
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单添加失败,服务端返回 " + msg);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowError("中转仓退货订单创建失败,售后单获取失败");
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败");
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
|
||||
@@ -239,17 +239,17 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = createReturnOrderRst;
|
||||
BaseMsgWindow.ShowError("中转仓退货订单创建失败,服务端返回 " + msg);
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this);
|
||||
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)
|
||||
@@ -325,7 +325,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
if (OrderItem.DistribReturnOrderInfo == null)
|
||||
{
|
||||
@@ -337,18 +337,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = getTransitAfterSaleRst;
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单添加失败,服务端返回 " + msg, "Error", 5);
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单添加失败,服务端返回 " + msg, "Error", 5);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
|
||||
if (string.IsNullOrEmpty(orderCode))
|
||||
{
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败,售后单获取失败", "Error", 5);
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败", "Error", 5);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
|
||||
@@ -363,16 +363,16 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
string msg = BaseRegex.GetStringXml(ref createReturnOrderRst, "msg");
|
||||
if (msg.IsNullOrEmpty())
|
||||
msg = createReturnOrderRst;
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5);
|
||||
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5);
|
||||
await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
return;
|
||||
}
|
||||
|
||||
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
|
||||
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
|
||||
OrderItem.DistribReturnOrderInfos = returnOrders;
|
||||
StartUp.UpdateBalance();
|
||||
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建成功", "Msg", 2);
|
||||
BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);
|
||||
}
|
||||
|
||||
private void btnAddressAnalysis_Click(object sender, RoutedEventArgs e)
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace AllBase
|
||||
/// 版本ID
|
||||
/// </summary>
|
||||
|
||||
public static int VersionCount = 365;
|
||||
public static int VersionCount = 392;
|
||||
|
||||
//public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||
public static string ServerUrl
|
||||
@@ -604,6 +604,7 @@ namespace AllBase
|
||||
|
||||
public static string PassWordBak { get; set; }
|
||||
public static string Mobile { get; set; }
|
||||
public static bool AllowTraditionalBuyAddress { get; set; }
|
||||
public static string ParentAuthority { get; set; }
|
||||
public static string ForbiddenPage { get; set; }
|
||||
public static string UserAuthority { get; set; }
|
||||
|
||||
@@ -15,4 +15,19 @@ public class SettingConfig
|
||||
/// </summary>
|
||||
public bool AutoSwitchGiftType { get; set; } = true;
|
||||
#endregion
|
||||
|
||||
#region 拍单
|
||||
/// <summary>
|
||||
/// 允许直发拍单
|
||||
/// </summary>
|
||||
public bool SwitchEnableDirectBuy { get; set; } = false;
|
||||
/// <summary>
|
||||
/// 拼多多仓库订单使用随机繁体字
|
||||
/// </summary>
|
||||
public bool SwitchEnablePddTransitTraditionalAddress { get; set; } = false;
|
||||
/// <summary>
|
||||
/// 是否显示使用随机繁体字配置(不显示则不可使用繁体字)
|
||||
/// </summary>
|
||||
public bool ShowEnablePddTransitTraditionalAddress { get; set; } = false;
|
||||
#endregion
|
||||
}
|
||||
@@ -39,7 +39,9 @@ namespace AllBase.Model.DBModel
|
||||
public int district_id { get; set; }
|
||||
public string province_name { get;set; }
|
||||
public string city_name { get; set; }
|
||||
}
|
||||
public string district_name { get; set; }
|
||||
|
||||
}
|
||||
|
||||
public class TransitWarehouseData
|
||||
{
|
||||
@@ -64,16 +66,53 @@ namespace AllBase.Model.DBModel
|
||||
{ "XDYFJSSC", "福建仓" },
|
||||
};
|
||||
|
||||
public static string TransitWarehouseDataStr = @"
|
||||
|
||||
public static string TransitWarehouseDataStr = @"
|
||||
XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室
|
||||
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
|
||||
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头
|
||||
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司(仓库二楼)
|
||||
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市 ;普陀区 ;真如镇街道 ;真北路2653弄T区
|
||||
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐汇区徐家汇街道虹桥路616号A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
|
||||
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼
|
||||
XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
|
||||
XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋";
|
||||
|
||||
public static Dictionary<char, List<char>> dicChineseNumberChar = new Dictionary<char, List<char>>()
|
||||
{
|
||||
{ '1', new List<char> { '一', '壹' } },
|
||||
{ '2', new List<char> { '二', '贰' } },
|
||||
{ '3', new List<char> { '三', '叁' } },
|
||||
{ '4', new List<char> { '四', '肆' } },
|
||||
{ '5', new List<char> { '五', '伍' } },
|
||||
{ '6', new List<char> { '六', '陆' } },
|
||||
{ '7', new List<char> { '七', '柒' } },
|
||||
{ '8', new List<char> { '八', '捌' } },
|
||||
{ '9', new List<char> { '九', '玖' } },
|
||||
{ '0', new List<char> { '零', '〇' } },
|
||||
{ '一', new List<char> { '壹' } },
|
||||
{ '二', new List<char> { '贰' } },
|
||||
{ '三', new List<char> { '叁' } },
|
||||
{ '四', new List<char> { '肆' } },
|
||||
{ '五', new List<char> { '伍' } },
|
||||
{ '六', new List<char> { '陆' } },
|
||||
{ '七', new List<char> { '柒' } },
|
||||
{ '八', new List<char> { '捌' } },
|
||||
{ '九', new List<char> { '玖' } },
|
||||
{ '零', new List<char> { '〇' } },
|
||||
};
|
||||
|
||||
// public static string TransitWarehouseDataStrTraditional = @"
|
||||
//XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市順義區光明街道濱河小區七區一號樓 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;濱河小區七區一號樓一零八室
|
||||
//XDYGZC ;广州仓 ;何外华 ;13826339849 ;廣州市增城區朱村街道育山一路六八號國際物流園 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路六八號國際物流園
|
||||
//XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武漢市江漢區民族街道沿江大道輪渡龍王廟碼頭 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道輪渡龍王廟碼頭
|
||||
//XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山東省臨沂市費縣南外環東轉盤往東二零零米順通快遞有限公司(倉庫二樓) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;費城街道 ;南外環東轉盤往東二零零米順通快遞有限公司(倉庫二樓)
|
||||
//XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐匯區徐家匯街道虹橋路六一六號A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家匯街道 ;虹橋路六一六號A座
|
||||
//XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;廣東省東莞市鳳崗鎮浸校塘東良巷逸樂軒E棟五號樓 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;鳳崗街道 ;浸校塘東良巷逸樂軒E棟五號樓
|
||||
//XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市後宅街道金城高爾夫二期別墅區四零一棟 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;後宅街道 ;金城高爾夫二期別墅區四零一棟
|
||||
//XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青陽街道中堡電商園一棟 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青陽街道 ;中堡電商園一棟";
|
||||
|
||||
//XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市徐汇区徐家汇街道虹桥路616号A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
|
||||
//XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市 ;普陀区 ;真如镇街道 ;真北路2653弄T区
|
||||
//XDYFJSSC 石狮仓 福建省/泉州市/晋江市青阳街道中堡电商园一栋
|
||||
//XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;北苑街道 ;西站大道妈妈商贸18号库39号楼誉达
|
||||
//XDYJJC ;晋江仓 ;安群 ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
|
||||
@@ -98,7 +137,7 @@ XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青
|
||||
|
||||
static List<TransitWarehouseParam> transitWarehouseList = null;
|
||||
|
||||
public static List<TransitWarehouseParam> TransitWarehouseList
|
||||
public static List<TransitWarehouseParam> TransitWarehouseList
|
||||
{
|
||||
get
|
||||
{
|
||||
@@ -124,6 +163,7 @@ XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青
|
||||
district_id = arr[7].Trim().ParseToInt(),
|
||||
province_name = arr[8].Trim(),
|
||||
city_name = arr[9].Trim(),
|
||||
district_name = arr[10].Trim(),
|
||||
};
|
||||
transitWarehouseList.Add(tw);
|
||||
}
|
||||
@@ -135,5 +175,7 @@ XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static List<TransitWarehouseParam> transitWarehouseTList = null;
|
||||
}
|
||||
}
|
||||
@@ -110,6 +110,13 @@ namespace AllBase.Model.DBModel
|
||||
/// 货架写入时间
|
||||
/// </summary>
|
||||
public DateTime? location_write_time { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 1商品退货包裹2额外退货包裹
|
||||
/// </summary>
|
||||
public int? pack_type { get; set; }
|
||||
/// <summary>
|
||||
/// 作废状态 1作废成功 2作废失败
|
||||
/// </summary>
|
||||
public int? order_void_status { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -21,18 +21,31 @@ namespace AllBase.Model.DBModel
|
||||
return this.GetValue(x => x.OutOrderNumStr);
|
||||
}
|
||||
set { this.SetValue(x => x.OutOrderNumStr, value); }
|
||||
}
|
||||
}
|
||||
public string OutOrderBuyerStr
|
||||
{
|
||||
get { return this.GetValue(x => x.OutOrderBuyerStr); }
|
||||
set { this.SetValue(x => x.OutOrderBuyerStr, value); }
|
||||
}
|
||||
}
|
||||
public string OutOrderBuyerIdStr
|
||||
{
|
||||
get { return this.GetValue(x => x.OutOrderBuyerIdStr); }
|
||||
set { this.SetValue(x => x.OutOrderBuyerIdStr, value); }
|
||||
}
|
||||
public void SetOutOrderBuyerStr()
|
||||
{
|
||||
if (!out_order_no.ParseToString().StartsWith("tb_"))
|
||||
OutOrderBuyerStr = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account)?.buyer_name ?? buyer_account;
|
||||
{
|
||||
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account);
|
||||
OutOrderBuyerStr = buyer?.buyer_name ?? buyer_account;
|
||||
OutOrderBuyerIdStr = buyer?.buyer_id ?? buyer_account;
|
||||
}
|
||||
else
|
||||
OutOrderBuyerStr = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account)?.buyer_name ?? buyer_account;
|
||||
{
|
||||
var buyer = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account);
|
||||
OutOrderBuyerStr = buyer?.buyer_name ?? buyer_account;
|
||||
OutOrderBuyerIdStr = buyer?.buyer_id ?? buyer_account;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -833,10 +833,6 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
public bool GetIsWaitBuy()
|
||||
{
|
||||
if (order_id == "3738686976228742912")
|
||||
{
|
||||
|
||||
}
|
||||
if (status != 20 && status != 21)
|
||||
return false;
|
||||
if (refundItems?.Any(r => r.IsRefund) == true)
|
||||
@@ -897,11 +893,6 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
public bool GetIsAbnormal()
|
||||
{
|
||||
if (order_id == "3740040052771291904")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// 三退或者两退,为退款完成单
|
||||
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
|
||||
// (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.MvvmBaseClasses;
|
||||
using NaiBa.Util;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using Org.BouncyCastle.Asn1.Mozilla;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
@@ -20,14 +22,127 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
public class oms_wei_order_item_info : PropertyNotifyObject
|
||||
{
|
||||
/// <summary>
|
||||
/// 订单对应店铺
|
||||
/// </summary>
|
||||
public ShopLoginInfo Shop
|
||||
{
|
||||
get { return this.GetValue(x => x.Shop); }
|
||||
set { this.SetValue(x => x.Shop, value); }
|
||||
public List<oms_wei_order_item_transit_detail_info> TransitPackageList
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitPackageList); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.TransitPackageList, value);
|
||||
TransitPackageLatest = TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault(p => p.TransitVoidStatus != "已作废") ??
|
||||
TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault() ??
|
||||
new oms_wei_order_item_transit_detail_info();
|
||||
}
|
||||
}
|
||||
public oms_wei_order_item_transit_detail_info TransitPackageLatest
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitPackageLatest); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.TransitPackageLatest, value);
|
||||
TransitPackageLatestWarehouseStatusStr = value?.TransitTypeStr + value?.WarehouseStatus;
|
||||
TransitPackageLatestVoidStatusStr = value?.TransitVoidStatus == "已作废" ? value?.TransitTypeStr + "已作废" : "";
|
||||
if (order_id == "3740305724012410112")
|
||||
{
|
||||
|
||||
}
|
||||
if (value != null && value?.TransitTypeStr != "发货包裹")
|
||||
VoidPackageTypeStr = "作废" + value?.TransitTypeStr;
|
||||
else
|
||||
{
|
||||
VoidPackageTypeStr = "";
|
||||
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;
|
||||
// }
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
public string TransitPackageLatestWarehouseStatusStr
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStr); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.TransitPackageLatestWarehouseStatusStr, value);
|
||||
var str = value ?? "";
|
||||
|
||||
TransitPackageLatestWarehouseStatusStrVisibility = str.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
|
||||
|
||||
// 状态文字颜色
|
||||
if (str.Contains("已出库"))
|
||||
WarehouseWaybillStatusStrColor = GlobalConfig.GreenBrush;
|
||||
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
|
||||
WarehouseWaybillStatusStrColor = GlobalConfig.YellowBrush;
|
||||
else // if (str.Contains("待取号"))
|
||||
WarehouseWaybillStatusStrColor = GlobalConfig.RedBrush;
|
||||
// 状态边框颜色
|
||||
if (str.Contains("已出库"))
|
||||
WarehouseWaybillStatusBorderColor = GlobalConfig.GreenBrush75;
|
||||
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
|
||||
WarehouseWaybillStatusBorderColor = GlobalConfig.YellowBrush75;
|
||||
else // if (str.Contains("待取号"))
|
||||
WarehouseWaybillStatusBorderColor = GlobalConfig.RedBrush75;
|
||||
// 状态背景颜色
|
||||
if (str.Contains("已出库"))
|
||||
WarehouseWaybillStatusBackColor = GlobalConfig.GreenBrush35;
|
||||
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
|
||||
WarehouseWaybillStatusBackColor = GlobalConfig.YellowBrush35;
|
||||
else // if (str.Contains("待取号"))
|
||||
WarehouseWaybillStatusBackColor = GlobalConfig.RedBrush35;
|
||||
}
|
||||
}
|
||||
|
||||
public Visibility TransitPackageLatestWarehouseStatusStrVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility); }
|
||||
set { this.SetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility, value); }
|
||||
}
|
||||
|
||||
public string TransitPackageLatestVoidStatusStr
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStr); }
|
||||
set { this.SetValue(x => x.TransitPackageLatestVoidStatusStr, value); TransitPackageLatestVoidStatusStrVisibility = string.IsNullOrEmpty(value) ? Visibility.Collapsed : Visibility.Visible; }
|
||||
}
|
||||
|
||||
public Visibility TransitPackageLatestVoidStatusStrVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStrVisibility); }
|
||||
set { this.SetValue(x => x.TransitPackageLatestVoidStatusStrVisibility, value); }
|
||||
}
|
||||
|
||||
public string VoidPackageTypeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.VoidPackageTypeStr); }
|
||||
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>
|
||||
//public ShopLoginInfo Shop
|
||||
//{
|
||||
// get { return this.GetValue(x => x.Shop); }
|
||||
// set { this.SetValue(x => x.Shop, value); }
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// 订单扩展信息
|
||||
@@ -38,7 +153,6 @@ namespace AllBase.Model.DBModel
|
||||
set { this.SetValue(x => x.OrderItemVisibility, value); }
|
||||
}
|
||||
|
||||
|
||||
#region 订单采购参数
|
||||
/// <summary>
|
||||
/// 采购关联
|
||||
@@ -268,7 +382,7 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
|
||||
/// <summary>
|
||||
/// 当前仓库订单(不可以是作废单)
|
||||
/// 当前最新的一条仓库订单(不可以是作废单)
|
||||
/// </summary>
|
||||
public oms_wei_external_procurement_log_info ItemTransitOrder
|
||||
{
|
||||
@@ -276,7 +390,7 @@ namespace AllBase.Model.DBModel
|
||||
set { this.SetValue(x => x.ItemTransitOrder, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 当前仓库订单(可以是作废单)
|
||||
/// 当前最新的一条仓库订单(可以是作废单)
|
||||
/// </summary>
|
||||
public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
|
||||
{
|
||||
@@ -398,7 +512,9 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
this.ItemTransitExtraOrder = ItemTransitExtraOrders?.FirstOrDefault(t => t.order_void_status != 1) ?? ItemTransitExtraOrders.FirstOrDefault();
|
||||
|
||||
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
|
||||
// 未作废且已发出的商品退货包裹 ?? 未作废的商品退货包裹 ?? 任意商品退货包裹
|
||||
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault(taf => taf.order_void_status != 1 && !taf.downstream_waybill.IsNullOrEmpty()) ??
|
||||
ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault(taf => taf.order_void_status != 1) ?? ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault();
|
||||
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
|
||||
// 优先找非撤销买手退款单
|
||||
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
|
||||
@@ -472,13 +588,15 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
// 仓库物流售后拦截包裹按钮上的文字,仓库作废单不存在仓库物流,所以此处必须是有效的仓库单(含作废失败)
|
||||
AddEditTransitWarehouseAfterSaleStr = "添加";
|
||||
if (order_id == "3739241588056569856")
|
||||
if (order_id == "3740217344404934656")
|
||||
{
|
||||
|
||||
}
|
||||
if (this.ItemTransitOrderAfterSale != null)
|
||||
AddEditTransitWarehouseAfterSaleStr = "已添加";
|
||||
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
|
||||
if (this.ItemTransitOrderAfterSale != null && this.ItemTransitOrderAfterSale.order_void_status == 1)
|
||||
AddEditTransitWarehouseAfterSaleStr = "拦截作废";
|
||||
else if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
|
||||
AddEditTransitWarehouseAfterSaleStr = "拦截成功";
|
||||
else if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
|
||||
AddEditTransitWarehouseAfterSaleStr = "拦截失败";
|
||||
@@ -511,6 +629,10 @@ namespace AllBase.Model.DBModel
|
||||
InterceptReturnInfoStr = this.ItemTransitOrderWithVoid.intercept_return_info;
|
||||
|
||||
// 退货仓退货
|
||||
if (order_id == "3739991023710553600")
|
||||
{
|
||||
|
||||
}
|
||||
AddEditTransitWarehouseReturnOrderStr = "";
|
||||
if (ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true)
|
||||
{
|
||||
@@ -526,11 +648,12 @@ namespace AllBase.Model.DBModel
|
||||
AddEditTransitWarehouseReturnOrderStr = "创建失败";
|
||||
if (DistribReturnOrderInfo?.warehouse_status == 3)
|
||||
AddEditTransitWarehouseReturnOrderStr = "已创建未到仓";
|
||||
if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
{
|
||||
if (AddEditTransitWarehouseReturnOrderStr == "未创建")
|
||||
AddEditTransitWarehouseReturnOrderStr = "";
|
||||
}
|
||||
// 因为可能是云改直的最后退款或者买手退款了但是东西还没退回总店,所以此处不能不赋值(不赋值就会隐藏按钮无法创建分销退货)
|
||||
//if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
//{
|
||||
// if (AddEditTransitWarehouseReturnOrderStr == "未创建")
|
||||
// AddEditTransitWarehouseReturnOrderStr = "";
|
||||
//}
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
@@ -880,29 +1003,7 @@ namespace AllBase.Model.DBModel
|
||||
}
|
||||
public void SetTransitRefundStatusStr()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status))
|
||||
{
|
||||
// 店铺售后又取消的,如果是买手还没申请售后,不显示需手动申请售后文字
|
||||
if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
|
||||
TransitRefundStatusStr = "";
|
||||
|
||||
// 显示售后金额(如果有)
|
||||
else if (ItemTransitOrderWithVoid.refund_status.EndsWith("买手退款成功"))
|
||||
{
|
||||
if (PddBuyerAfterSale?.refundAmount != null)
|
||||
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status + "(¥" + PddBuyerAfterSale.refundAmount * 0.01m + ")";
|
||||
else
|
||||
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status + "(退款金额待获取)";
|
||||
}
|
||||
|
||||
else if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && !ItemTransitOrderWithVoid.refund_status.Contains("已超过可申请售后的时间"))
|
||||
TransitRefundStatusStr = "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到,", "");
|
||||
else
|
||||
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status;
|
||||
}
|
||||
else
|
||||
TransitRefundStatusStr = "";
|
||||
|
||||
TransitRefundStatusStr = oms_wei_order_item_transit_model.GetTransitBuyerRefundStatusStr(this, ItemTransitOrder ?? ItemTransitOrderWithVoid);
|
||||
|
||||
if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
TransitRefundStatusBackColor = GlobalConfig.GreenBrush;
|
||||
@@ -1175,7 +1276,7 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
}
|
||||
if (!this.ItemOrder.out_after_sale_status.ParseToString().Contains("需手动申请售后"))
|
||||
this.ItemOrder.out_after_sale_status = DirectPddBuyerAfterSale?.statusText;
|
||||
this.ItemOrder.out_after_sale_status = DirectPddBuyerAfterSale?.statusText ?? ItemOrder.out_after_sale_status;
|
||||
|
||||
DirectRefundStatusStr = this.ItemOrder.out_after_sale_status.ParseToString();
|
||||
if (DirectRefundStatusStr.Contains("退款成功"))
|
||||
@@ -1428,64 +1529,84 @@ namespace AllBase.Model.DBModel
|
||||
catch { SkuAttrStr = "获取失败"; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 拼多多秒退异常重拍按钮可见条件
|
||||
/// </summary>
|
||||
public Visibility BtnAbnormalBtnVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnAbnormalBtnVisibility); }
|
||||
set { this.SetValue(x => x.BtnAbnormalBtnVisibility, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 直发按钮可见条件
|
||||
/// </summary>
|
||||
public Visibility BtnDirectBuyOrderVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); }
|
||||
set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); }
|
||||
}
|
||||
public void SetAbnormalAndDirectBtnVisibility()
|
||||
{
|
||||
// 买手秒退异常重拍
|
||||
BtnAbnormalBtnVisibility = Visibility.Visible;
|
||||
// 不是异常单的不可异常重拍
|
||||
if (this.ItemOrder?.IsAbnormal != true)
|
||||
BtnAbnormalBtnVisibility = Visibility.Collapsed;
|
||||
// 买手未退款的,中转正式取号以后的,不可异常重拍
|
||||
else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
|
||||
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
|
||||
/// <summary>
|
||||
/// 作废按钮可见性
|
||||
/// </summary>
|
||||
public Visibility BtnVoidTransitOrderVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
|
||||
set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 异常重拍按钮可见性
|
||||
/// </summary>
|
||||
public Visibility BtnAbnormalOrderRebuyVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
|
||||
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 直发按钮可见条件
|
||||
/// </summary>
|
||||
public Visibility BtnDirectBuyOrderVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); }
|
||||
set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); }
|
||||
}
|
||||
public bool? _itemOrderIsAbnormal { get; set; } = false;
|
||||
public bool? _itemOrderIsWaitBuy { get; set; } = false;
|
||||
public void SetAbnormalAndDirectBtnVisibility()
|
||||
{
|
||||
_itemOrderIsAbnormal = ItemOrder?.GetIsAbnormal();
|
||||
if (ItemOrder != null)
|
||||
ItemOrder.IsAbnormal = _itemOrderIsAbnormal == true;
|
||||
_itemOrderIsWaitBuy = ItemOrder?.GetIsWaitBuy();
|
||||
if (ItemOrder != null)
|
||||
ItemOrder.IsWaitBuy = _itemOrderIsWaitBuy == true;
|
||||
|
||||
// 买手秒退异常重拍
|
||||
var _btnAbnormalOrderRebuyVisibility = Visibility.Visible;
|
||||
// 不是异常单的不可异常重拍
|
||||
if (_itemOrderIsAbnormal != true)
|
||||
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
|
||||
// 买手未退款的,中转正式取号以后的,不可异常重拍
|
||||
else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
|
||||
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
|
||||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
|
||||
BtnAbnormalBtnVisibility = Visibility.Collapsed;
|
||||
// 已正式取号的,不可异常重拍
|
||||
if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
|
||||
BtnAbnormalBtnVisibility = Visibility.Collapsed;
|
||||
// 仓库异常的异常单不可异常重拍
|
||||
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
|
||||
if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
|
||||
BtnAbnormalBtnVisibility = Visibility.Collapsed;
|
||||
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
|
||||
// 已正式取号的,不可异常重拍
|
||||
else if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
|
||||
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
|
||||
// 仓库异常的异常单不可异常重拍
|
||||
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
|
||||
if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
|
||||
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
|
||||
BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility;
|
||||
|
||||
if (order_id == "3738706885587395328")
|
||||
// 直拍按钮
|
||||
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||
if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// 直拍按钮
|
||||
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||
{
|
||||
if (this.ItemOrder?.GetIsWaitBuy() == true && this.BuyGoodsBtnTxt != "关联拍单")
|
||||
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||
//{
|
||||
//}
|
||||
//else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
||||
//{
|
||||
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
|
||||
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
||||
if (this.ItemOrder?.GetIsAbnormal() == true && this.refund_status <= 1)
|
||||
else if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
|
||||
{
|
||||
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
|
||||
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")
|
||||
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||
//}
|
||||
}
|
||||
//else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
||||
{
|
||||
}
|
||||
}
|
||||
else
|
||||
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
public string RefundStatusStr
|
||||
{
|
||||
@@ -1498,17 +1619,6 @@ namespace AllBase.Model.DBModel
|
||||
set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
|
||||
}
|
||||
|
||||
public Visibility BtnVoidTransitOrderVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
|
||||
set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
|
||||
}
|
||||
public Visibility BtnAbnormalOrderRebuyVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
|
||||
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
|
||||
}
|
||||
|
||||
public Visibility OutOrderNoVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.OutOrderNoVisibility); }
|
||||
@@ -1519,152 +1629,152 @@ namespace AllBase.Model.DBModel
|
||||
/// 订单商品表数据库id
|
||||
/// </summary>
|
||||
public long id { get; set; }
|
||||
public long shop_id { get; set; }
|
||||
/// <summary>
|
||||
/// 商户ID
|
||||
/// </summary>
|
||||
public long merchant_id { get; set; }
|
||||
/// <summary>
|
||||
/// 订单id(平台订单id)
|
||||
/// </summary>
|
||||
public string order_id { get; set; }
|
||||
/// <summary>
|
||||
/// 商品spuid
|
||||
/// </summary>
|
||||
public string product_id { get; set; }
|
||||
public string sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// sku小图
|
||||
/// </summary>
|
||||
public string thumb_img
|
||||
public long shop_id { get; set; }
|
||||
/// <summary>
|
||||
/// 商户ID
|
||||
/// </summary>
|
||||
public long merchant_id { get; set; }
|
||||
/// <summary>
|
||||
/// 订单id(平台订单id)
|
||||
/// </summary>
|
||||
public string order_id { get; set; }
|
||||
/// <summary>
|
||||
/// 商品spuid
|
||||
/// </summary>
|
||||
public string product_id { get; set; }
|
||||
public string sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// sku小图
|
||||
/// </summary>
|
||||
public string thumb_img
|
||||
{
|
||||
get { return this.GetValue(x => x.thumb_img); }
|
||||
set { this.SetValue(x => x.thumb_img, value); IsLoadThumbImg = !string.IsNullOrEmpty(value); ThumbImgStr = thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80"; }
|
||||
}
|
||||
/// <summary>
|
||||
/// sku数量
|
||||
/// </summary>
|
||||
public int? sku_cnt { get; set; }
|
||||
/// <summary>
|
||||
/// 售卖单价(单位:分)
|
||||
/// </summary>
|
||||
public int? sale_price { get; set; }
|
||||
/// <summary>
|
||||
/// 商品名称
|
||||
/// </summary>
|
||||
public string title { get; set; }
|
||||
/// <summary>
|
||||
/// 正在售后/退款流程中的 sku 数量
|
||||
/// </summary>
|
||||
public int? on_aftersale_sku_cnt { get; set; }
|
||||
/// <summary>
|
||||
/// 完成售后/退款的 sku 数量
|
||||
/// </summary>
|
||||
public int? finish_aftersale_sku_cnt { get; set; }
|
||||
/// <summary>
|
||||
/// 商品编码
|
||||
/// </summary>
|
||||
public string sku_code { get; set; }
|
||||
/// <summary>
|
||||
/// 市场单价(单位:分)
|
||||
/// </summary>
|
||||
public int? market_price { get; set; }
|
||||
/// <summary>
|
||||
/// sku属性JSON
|
||||
/// </summary>
|
||||
public string sku_attrs
|
||||
/// <summary>
|
||||
/// sku数量
|
||||
/// </summary>
|
||||
public int? sku_cnt { get; set; }
|
||||
/// <summary>
|
||||
/// 售卖单价(单位:分)
|
||||
/// </summary>
|
||||
public int? sale_price { get; set; }
|
||||
/// <summary>
|
||||
/// 商品名称
|
||||
/// </summary>
|
||||
public string title { get; set; }
|
||||
/// <summary>
|
||||
/// 正在售后/退款流程中的 sku 数量
|
||||
/// </summary>
|
||||
public int? on_aftersale_sku_cnt { get; set; }
|
||||
/// <summary>
|
||||
/// 完成售后/退款的 sku 数量
|
||||
/// </summary>
|
||||
public int? finish_aftersale_sku_cnt { get; set; }
|
||||
/// <summary>
|
||||
/// 商品编码
|
||||
/// </summary>
|
||||
public string sku_code { get; set; }
|
||||
/// <summary>
|
||||
/// 市场单价(单位:分)
|
||||
/// </summary>
|
||||
public int? market_price { get; set; }
|
||||
/// <summary>
|
||||
/// sku属性JSON
|
||||
/// </summary>
|
||||
public string sku_attrs
|
||||
{
|
||||
get { return this.GetValue(x => x.sku_attrs); }
|
||||
set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); }
|
||||
}
|
||||
/// <summary>
|
||||
/// sku实付总价,取estimate_price和change_price中较小值
|
||||
/// </summary>
|
||||
public int? real_price { get; set; }
|
||||
/// <summary>
|
||||
/// 商品外部spuid
|
||||
/// </summary>
|
||||
public string out_product_id { get; set; }
|
||||
/// <summary>
|
||||
/// 采购价
|
||||
/// </summary>
|
||||
public int? purchase_price { get; set; }
|
||||
/// <summary>
|
||||
/// 运费
|
||||
/// </summary>
|
||||
public int? freight { get; set; }
|
||||
/// <summary>
|
||||
/// 商品外部skuid
|
||||
/// </summary>
|
||||
public string out_sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// 是否有优惠金额,非必填,默认为false
|
||||
/// </summary>
|
||||
public string is_discounted { get; set; }
|
||||
/// <summary>
|
||||
/// 优惠后sku总价,非必填,is_discounted为true时有值
|
||||
/// </summary>
|
||||
public int? estimate_price { get; set; }
|
||||
/// <summary>
|
||||
/// 是否修改过价格,非必填,默认为false
|
||||
/// </summary>
|
||||
public string is_change_price { get; set; }
|
||||
/// <summary>
|
||||
/// 改价后sku总价,非必填,is_change_price为true时有值
|
||||
/// </summary>
|
||||
public int? change_price { get; set; }
|
||||
/// <summary>
|
||||
/// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
|
||||
/// </summary>
|
||||
public int? cash_coupon_discounted_price { get; set; }
|
||||
/// <summary>
|
||||
/// 区域库存id
|
||||
/// </summary>
|
||||
public string out_warehouse_id { get; set; }
|
||||
/// <summary>
|
||||
/// 退货地址
|
||||
/// </summary>
|
||||
public string return_address { get; set; }
|
||||
/// <summary>
|
||||
/// 商品发货信息JSON
|
||||
/// </summary>
|
||||
public string sku_deliver_info { get; set; }
|
||||
/// <summary>
|
||||
/// 商品额外服务信息JSON
|
||||
/// </summary>
|
||||
public string extra_service { get; set; }
|
||||
/// <summary>
|
||||
/// 是否使用了会员积分抵扣
|
||||
/// </summary>
|
||||
public string use_deduction { get; set; }
|
||||
/// <summary>
|
||||
/// 会员积分抵扣金额,单位为分
|
||||
/// </summary>
|
||||
public int? deduction_price { get; set; }
|
||||
/// <summary>
|
||||
/// 平台服务费(微信小店:预计技术服务费),单位为分
|
||||
/// </summary>
|
||||
public int? predict_commission_fee { get; set; }
|
||||
/// <summary>
|
||||
/// 达人佣金(微信小店:分账金额),单位为分
|
||||
/// </summary>
|
||||
public int? commission_amount { get; set; }
|
||||
/// <summary>
|
||||
/// 商品优惠券信息,逐步替换 order.order_detail.coupon_info
|
||||
/// </summary>
|
||||
public string order_product_coupon_info_list { get; set; }
|
||||
/// <summary>
|
||||
/// 商品id(o_goods外键)
|
||||
/// </summary>
|
||||
public long? erp_goods_id { get; set; }
|
||||
/// <summary>
|
||||
/// 商品skuid(o_goods_sku外键)
|
||||
/// </summary>
|
||||
public long? erp_goods_sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消)
|
||||
/// </summary>
|
||||
public int? refund_status
|
||||
/// <summary>
|
||||
/// sku实付总价,取estimate_price和change_price中较小值
|
||||
/// </summary>
|
||||
public int? real_price { get; set; }
|
||||
/// <summary>
|
||||
/// 商品外部spuid
|
||||
/// </summary>
|
||||
public string out_product_id { get; set; }
|
||||
/// <summary>
|
||||
/// 采购价
|
||||
/// </summary>
|
||||
public int? purchase_price { get; set; }
|
||||
/// <summary>
|
||||
/// 运费
|
||||
/// </summary>
|
||||
public int? freight { get; set; }
|
||||
/// <summary>
|
||||
/// 商品外部skuid
|
||||
/// </summary>
|
||||
public string out_sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// 是否有优惠金额,非必填,默认为false
|
||||
/// </summary>
|
||||
public string is_discounted { get; set; }
|
||||
/// <summary>
|
||||
/// 优惠后sku总价,非必填,is_discounted为true时有值
|
||||
/// </summary>
|
||||
public int? estimate_price { get; set; }
|
||||
/// <summary>
|
||||
/// 是否修改过价格,非必填,默认为false
|
||||
/// </summary>
|
||||
public string is_change_price { get; set; }
|
||||
/// <summary>
|
||||
/// 改价后sku总价,非必填,is_change_price为true时有值
|
||||
/// </summary>
|
||||
public int? change_price { get; set; }
|
||||
/// <summary>
|
||||
/// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
|
||||
/// </summary>
|
||||
public int? cash_coupon_discounted_price { get; set; }
|
||||
/// <summary>
|
||||
/// 区域库存id
|
||||
/// </summary>
|
||||
public string out_warehouse_id { get; set; }
|
||||
/// <summary>
|
||||
/// 退货地址
|
||||
/// </summary>
|
||||
public string return_address { get; set; }
|
||||
/// <summary>
|
||||
/// 商品发货信息JSON
|
||||
/// </summary>
|
||||
public string sku_deliver_info { get; set; }
|
||||
/// <summary>
|
||||
/// 商品额外服务信息JSON
|
||||
/// </summary>
|
||||
public string extra_service { get; set; }
|
||||
/// <summary>
|
||||
/// 是否使用了会员积分抵扣
|
||||
/// </summary>
|
||||
public string use_deduction { get; set; }
|
||||
/// <summary>
|
||||
/// 会员积分抵扣金额,单位为分
|
||||
/// </summary>
|
||||
public int? deduction_price { get; set; }
|
||||
/// <summary>
|
||||
/// 平台服务费(微信小店:预计技术服务费),单位为分
|
||||
/// </summary>
|
||||
public int? predict_commission_fee { get; set; }
|
||||
/// <summary>
|
||||
/// 达人佣金(微信小店:分账金额),单位为分
|
||||
/// </summary>
|
||||
public int? commission_amount { get; set; }
|
||||
/// <summary>
|
||||
/// 商品优惠券信息,逐步替换 order.order_detail.coupon_info
|
||||
/// </summary>
|
||||
public string order_product_coupon_info_list { get; set; }
|
||||
/// <summary>
|
||||
/// 商品id(o_goods外键)
|
||||
/// </summary>
|
||||
public long? erp_goods_id { get; set; }
|
||||
/// <summary>
|
||||
/// 商品skuid(o_goods_sku外键)
|
||||
/// </summary>
|
||||
public long? erp_goods_sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消)
|
||||
/// </summary>
|
||||
public int? refund_status
|
||||
{
|
||||
get { return this.GetValue(x => x.refund_status); }
|
||||
set
|
||||
@@ -1683,11 +1793,11 @@ namespace AllBase.Model.DBModel
|
||||
}
|
||||
}
|
||||
|
||||
public void SetOrderItemTextProperty()
|
||||
{
|
||||
CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt());
|
||||
CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss");
|
||||
UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
|
||||
public void SetOrderItemTextProperty()
|
||||
{
|
||||
CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt());
|
||||
CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss");
|
||||
UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
|
||||
|
||||
//if (PurpleBrush == null && GlobalConfig.Dispatcher != null)
|
||||
//{
|
||||
@@ -1699,14 +1809,13 @@ namespace AllBase.Model.DBModel
|
||||
//}
|
||||
|
||||
this.SetItemRefund();
|
||||
this.SetTransitOrder();
|
||||
this.SetDirectOrder();
|
||||
this.SetBuyerTransitWaybillStatusStr();
|
||||
this.SetWarehouseWaybillStatusStr();
|
||||
this.SetTransitOrder();
|
||||
this.SetDirectOrder();
|
||||
this.SetBuyerTransitWaybillStatusStr();
|
||||
this.SetWarehouseWaybillStatusStr();
|
||||
|
||||
// 拍单、代发等信息判断并控制拍单按钮
|
||||
this.UpdateOrderItemBuyButton();
|
||||
this.SetAbnormalAndDirectBtnVisibility();
|
||||
// 拍单、代发等信息判断并控制拍单按钮
|
||||
this.UpdateOrderItemBuyButton();
|
||||
|
||||
SetEWaybillInfo();
|
||||
SetOutOrderTimeQualifiedStr();
|
||||
@@ -1724,15 +1833,18 @@ namespace AllBase.Model.DBModel
|
||||
ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
|
||||
ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
|
||||
}
|
||||
|
||||
|
||||
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
|
||||
{
|
||||
OrderItem = this,
|
||||
};
|
||||
TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
|
||||
}
|
||||
|
||||
/// <summary> 初始化物流明细信息 </summary>
|
||||
public void SetEWaybillInfo()
|
||||
{
|
||||
if(order_id == "3738794693820307200")
|
||||
{
|
||||
|
||||
}
|
||||
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
|
||||
LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
|
||||
else
|
||||
@@ -1747,10 +1859,12 @@ namespace AllBase.Model.DBModel
|
||||
public void UpdateOrderItemBuyButton()
|
||||
{
|
||||
var order_item = this;
|
||||
order_item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == order_item.shop_id.ParseToString());
|
||||
var Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == order_item.shop_id.ParseToString());
|
||||
|
||||
// 关联商品sku
|
||||
if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||
if (this.refund_status > 1)
|
||||
MapSkusBtnVisibility = Visibility.Collapsed;
|
||||
else if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||
{
|
||||
if (PddBuyMapSkus != null && PddBuyMapSkus.Count > 0)
|
||||
MapSkusBtnVisibility = Visibility.Visible;
|
||||
@@ -1823,21 +1937,18 @@ namespace AllBase.Model.DBModel
|
||||
BtnVoidTransitOrderVisibility = Visibility.Visible;
|
||||
else
|
||||
BtnVoidTransitOrderVisibility = Visibility.Collapsed;
|
||||
// 异常重拍
|
||||
if (order_item.GetIsAbnormalOrderRebuy())
|
||||
BtnAbnormalOrderRebuyVisibility = Visibility.Visible;
|
||||
else
|
||||
BtnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
|
||||
// 异常重拍和直拍按钮
|
||||
SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 判断中转仓订单是否可以异常重拍
|
||||
/// 判断中转仓订单是否可以异常重拍(拍单时用,初始化数据时候返回的数据是错的)
|
||||
/// </summary>
|
||||
/// <param name="order_item"></param>
|
||||
/// <returns></returns>
|
||||
public bool GetIsAbnormalOrderRebuy()
|
||||
{
|
||||
if (order_id == "3740040052771291904")
|
||||
if (order_id == "3740287208579314176")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -1845,11 +1956,12 @@ namespace AllBase.Model.DBModel
|
||||
var order_item = this;
|
||||
|
||||
// 不是异常单的不可异常重拍
|
||||
if (order_item?.ItemOrder?.IsAbnormal != true)
|
||||
if (order_item?.ItemOrder?.GetIsAbnormal() != true)
|
||||
return false;
|
||||
// 买手未退款的,中转正式取号以后的,不可异常重拍
|
||||
if (order_item.ItemTransitOrderWithVoid?.refund_status != "买手退款成功" ||
|
||||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
|
||||
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
|
||||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
|
||||
return false;
|
||||
// 已正式取号的,不可异常重拍
|
||||
if (order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
|
||||
@@ -1862,4 +1974,4 @@ namespace AllBase.Model.DBModel
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+262
-45
@@ -1,23 +1,26 @@
|
||||
using AllBase.Helper;
|
||||
using AllBase.Model.MvvmBaseClasses;
|
||||
using NaiBa.Util.Extension;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.IO.Ports;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace AllBase.Model.DBModel;
|
||||
|
||||
public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
||||
{
|
||||
public oms_wei_order_item_info OrderItem
|
||||
{
|
||||
get { return this.GetValue(x => x.OrderItem); }
|
||||
set
|
||||
{
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.OrderItem, value);
|
||||
GetOrderItemTransitList();
|
||||
}
|
||||
@@ -29,6 +32,13 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
private set { this.SetValue(x => x.OrderItemTransitDetailList, value); }
|
||||
}
|
||||
|
||||
private bool isGetLatestPackageInfo = false;
|
||||
|
||||
public oms_wei_order_item_transit_model (bool _isGetLatestPackage = false)
|
||||
{
|
||||
isGetLatestPackageInfo = _isGetLatestPackage;
|
||||
}
|
||||
|
||||
void GetOrderItemTransitList()
|
||||
{
|
||||
List<oms_wei_order_item_transit_detail_info> transitDetailList =
|
||||
@@ -85,8 +95,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
|
||||
BuyRefundStatus = transitOrder.refund_status,
|
||||
|
||||
CreateTime = transitOrder.created_time == DateTime.MinValue ? null : transitOrder.created_time,
|
||||
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
|
||||
CreateTimeStr = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
InboundTime = transitOrder.inbound_time,
|
||||
OutboundTime = transitOrder.outbound_time,
|
||||
|
||||
@@ -111,10 +121,18 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
transitDetail.TransitStatus = "创建失败";
|
||||
else if (transitOrder.transfer_warehouse_status == 3)
|
||||
transitDetail.TransitStatus = "创建中";
|
||||
else if (transitOrder.transfer_warehouse_status == 4)
|
||||
transitDetail.TransitStatus = "取号失败";
|
||||
|
||||
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
|
||||
if (transitOrder.warehouse_status == 0)
|
||||
transitDetail.WarehouseStatus = "已创建";
|
||||
if (transitOrder.transfer_warehouse_status == 4)
|
||||
transitDetail.WarehouseStatus = "取号失败";
|
||||
else if ((transitOrder.raw_message.ParseToString().Contains("取号异常") || transitOrder.raw_message.ParseToString().Contains("无法调用")) && transitOrder.transfer_warehouse_status != 1)
|
||||
transitDetail.WarehouseStatus = transitOrder.raw_message.Contains("超出派送范围") ? "取号异常(超区)" : "取号异常";
|
||||
else if (transitOrder.pickup_time > DateTime.MinValue == false)
|
||||
transitDetail.WarehouseStatus = "未取号";
|
||||
else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
|
||||
transitDetail.WarehouseStatus = "未入库";
|
||||
else if (transitOrder.warehouse_status == 1)
|
||||
transitDetail.WarehouseStatus = "已入库";
|
||||
else if (transitOrder.warehouse_status == 2)
|
||||
@@ -139,19 +157,64 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
transitDetail.TransitRejectStatus = "拒收成功";
|
||||
|
||||
var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
|
||||
var transitAfterSaleOrder = OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId);
|
||||
var transitAfterSaleOrder = /* 取未作废的退货包裹,如果取不到,就取第一个退货包裹 */
|
||||
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId && a.order_void_status != 1 && a.pack_type == 1) ??
|
||||
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId && a.pack_type == 1);
|
||||
if (transitAfterSaleOrder != null)
|
||||
transitDetail.TransitReturnStatus = "已申请拦截";
|
||||
if (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
|
||||
if (transitAfterSaleOrder != null && transitAfterSaleOrder.order_void_status == 1)
|
||||
transitDetail.TransitReturnStatus = "拦截作废";
|
||||
else if (transitAfterSaleOrder != null && (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill)))
|
||||
transitDetail.TransitReturnStatus = "拦截成功";
|
||||
else if (transitOrder.intercept_return_status == 2)
|
||||
else if (transitAfterSaleOrder != null && transitOrder.intercept_return_status == 2)
|
||||
transitDetail.TransitReturnStatus = "拦截失败";
|
||||
|
||||
transitDetail.TransitDetailRefundStatusStr = GetTransitBuyerRefundStatusStr(OrderItem, transitOrder);
|
||||
|
||||
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
|
||||
//transitDetail.RejectPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
|
||||
//transitDetail.ReturnPackageBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) &&
|
||||
// !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) ?
|
||||
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
|
||||
//transitDetail.InterceptPackageBtnVisibility = transitDetail.OutboundTime > DateTime.MinValue &&
|
||||
// !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) ?
|
||||
// Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
|
||||
//transitDetail.ExtraPackagesBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-4)) &&
|
||||
// !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) ?
|
||||
// Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
|
||||
|
||||
transitDetail.VoidPackageBtnVisibility = transitOrder.warehouse_status == 0 && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
|
||||
transitDetail.RejectPackageBtnVisibility = OrderItem?.ItemOrder?.GetIsWaitBuy() != true && transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
|
||||
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
|
||||
!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) ?
|
||||
Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */
|
||||
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.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
|
||||
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
|
||||
transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
|
||||
!(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.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1)) ||
|
||||
OrderItem._itemOrderIsAbnormal == true ?
|
||||
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
|
||||
|
||||
|
||||
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废发货包裹按钮 */
|
||||
//transitDetail.RejectPackageBtnVisibility = Visibility.Visible; /* 拒收发货包裹按钮 */
|
||||
//transitDetail.ReturnPackageBtnVisibility = Visibility.Visible; /* 退货包裹按钮 */
|
||||
//transitDetail.InterceptPackageBtnVisibility = Visibility.Visible; /* 拦截退货包裹按钮 */
|
||||
//transitDetail.ExtraPackagesBtnVisibility = Visibility.Visible; /* 额外发货包裹按钮 */
|
||||
|
||||
detailList.Add(transitDetail);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
return detailList;
|
||||
@@ -182,8 +245,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
|
||||
ShopName = OrderItem.ItemOrder.shop_name,
|
||||
|
||||
//TransitTypeStr = "拦截退回",
|
||||
TransitTypeStr = "退货包裹",
|
||||
TransitTypeStr = "退货包裹", /* 拦截退回 */
|
||||
|
||||
OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
|
||||
SourceCode = transitOrder?.random_code,
|
||||
@@ -202,9 +264,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
|
||||
BuyRefundStatus = transitOrder.refund_status,
|
||||
|
||||
// todo 售后暂时缺少取号时间
|
||||
PickUpTime = transitAftersaleOrder.pickup_time == DateTime.MinValue ? null : transitAftersaleOrder.pickup_time,
|
||||
CreateTimeStr = transitAftersaleOrder.created_time == null ? null : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
CreateTime = transitAftersaleOrder.created_time,
|
||||
PickUpTime = transitAftersaleOrder.pickup_time,
|
||||
InboundTime = transitAftersaleOrder.inbound_time,
|
||||
OutboundTime = transitAftersaleOrder.outbound_time,
|
||||
|
||||
@@ -231,8 +292,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
transitDetail.TransitStatus = "异常";
|
||||
|
||||
// 退货包裹入库状态 1=入库 2=出库
|
||||
if (transitAftersaleOrder.warehouse_status == 0)
|
||||
transitDetail.WarehouseStatus = "已创建";
|
||||
if (transitAftersaleOrder.warehouse_status == null || transitAftersaleOrder.warehouse_status == 0)
|
||||
transitDetail.WarehouseStatus = "未入库";
|
||||
else if (transitAftersaleOrder.warehouse_status == 1)
|
||||
transitDetail.WarehouseStatus = "已入库";
|
||||
else if (transitAftersaleOrder.warehouse_status == 2)
|
||||
@@ -240,21 +301,30 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
else if (transitAftersaleOrder.warehouse_status == 3)
|
||||
transitDetail.WarehouseStatus = "已拦截到仓";
|
||||
|
||||
// 售后暂时没有作废状态
|
||||
//if (transitAftersaleOrder.order_void_status == 1)
|
||||
// transitDetail.TransitVoidStatus = "已作废";
|
||||
// 售后作废状态
|
||||
if (transitAftersaleOrder.order_void_status == 1)
|
||||
transitDetail.TransitVoidStatus = "已作废";
|
||||
//else if (transitOrder.order_void_status == 2)
|
||||
// transitDetail.TransitVoidStatus = "作废失败";
|
||||
|
||||
|
||||
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
|
||||
|
||||
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; /* 作废退货包裹 */
|
||||
|
||||
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible;
|
||||
|
||||
// 售后表没有拒收和拒收状态功能
|
||||
|
||||
// 售后表拦截成功状态在主表或者额外包裹表显示
|
||||
// 售后表没有拦截和拦截状态功能
|
||||
// 主表或者额外包裹表的售后状态在主表显示
|
||||
|
||||
detailList.Add(transitDetail);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
return detailList;
|
||||
@@ -281,7 +351,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
var transitDetail = new oms_wei_order_item_transit_detail_info()
|
||||
{
|
||||
oms_wei_order_item_info = OrderItem,
|
||||
oms_wei_transfer_extra_package = transitExtraOrder,
|
||||
oms_wei_transfer_extra_package = transitExtraOrder, // 额外包裹
|
||||
|
||||
ShopName = OrderItem.ItemOrder.shop_name,
|
||||
|
||||
@@ -304,8 +374,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
DownWaybill = (transitExtraOrder.real_logistics_code + "-" + transitExtraOrder.real_logistics_express_code).Trim('-'),
|
||||
BuyRefundStatus = transitOrder.refund_status,
|
||||
|
||||
PickUpTime = transitExtraOrder.pickup_time == DateTime.MinValue ? null : transitExtraOrder.pickup_time,
|
||||
CreateTimeStr = transitExtraOrder.created_time == null ? null : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
CreateTime = transitExtraOrder.created_time,
|
||||
PickUpTime = transitExtraOrder.pickup_time,
|
||||
InboundTime = transitExtraOrder.inbound_time,
|
||||
OutboundTime = transitExtraOrder.outbound_time,
|
||||
|
||||
@@ -332,8 +402,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
transitDetail.TransitStatus = "处理中";
|
||||
|
||||
// 额外包裹入库状态 1=入库 2=出库
|
||||
if (transitExtraOrder.warehouse_status == 0)
|
||||
transitDetail.WarehouseStatus = "已创建";
|
||||
if (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0)
|
||||
transitDetail.WarehouseStatus = "未入库";
|
||||
else if (transitExtraOrder.warehouse_status == 1)
|
||||
transitDetail.WarehouseStatus = "已入库";
|
||||
else if (transitExtraOrder.warehouse_status == 2)
|
||||
@@ -359,14 +429,40 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
transitDetail.TransitRejectStatus = "拒收成功";
|
||||
|
||||
// 额外包裹拦截状态暂时没有,待补充
|
||||
//var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
|
||||
//var transitAfterSaleOrder = OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId);
|
||||
//if (transitAfterSaleOrder != null)
|
||||
// transitDetail.TransitReturnStatus = "已申请拦截";
|
||||
//if (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
|
||||
// transitDetail.TransitReturnStatus = "拦截成功";
|
||||
//else if (transitOrder.intercept_return_status == 2)
|
||||
// transitDetail.TransitReturnStatus = "拦截失败";
|
||||
var wayBillId = transitExtraOrder.logistics_express_code ?? transitExtraOrder.real_logistics_express_code;
|
||||
var transitAfterSaleOrder = /* 取未作废的退货包裹,如果取不到,就取第一个退货包裹 */
|
||||
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitExtraOrder.order_code && a.refund_waybill == wayBillId && a.order_void_status != 1 && a.pack_type == 2) ??
|
||||
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitExtraOrder.order_code && a.refund_waybill == wayBillId && a.pack_type == 2);
|
||||
if (transitAfterSaleOrder != null)
|
||||
transitDetail.TransitReturnStatus = "已申请拦截";
|
||||
if (transitAfterSaleOrder != null && transitAfterSaleOrder.order_void_status == 1)
|
||||
transitDetail.TransitReturnStatus = "拦截作废";
|
||||
if (transitAfterSaleOrder != null && transitExtraOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
|
||||
transitDetail.TransitReturnStatus = "拦截成功";
|
||||
else if (transitAfterSaleOrder != null && transitExtraOrder.intercept_return_status == 2)
|
||||
transitDetail.TransitReturnStatus = "拦截失败";
|
||||
|
||||
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
|
||||
//transitDetail.ReturnPackageBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) &&
|
||||
// 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; /* 退货包裹按钮 */
|
||||
//transitDetail.InterceptPackageBtnVisibility = transitDetail.OutboundTime > DateTime.MinValue &&
|
||||
// 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; /* 拦截退货包裹按钮 */
|
||||
|
||||
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; /* 作废额外包裹 */
|
||||
// 额外包裹在仓库只能作废,出仓以后才能拦截退回
|
||||
//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) ?
|
||||
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
|
||||
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) ?
|
||||
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
|
||||
|
||||
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废额外包裹 */
|
||||
//transitDetail.ReturnPackageBtnVisibility = Visibility.Visible; /* 退货包裹按钮 */
|
||||
//transitDetail.InterceptPackageBtnVisibility = Visibility.Visible; /* 拦截退货包裹按钮 */
|
||||
|
||||
detailList.Add(transitDetail);
|
||||
}
|
||||
@@ -377,14 +473,58 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
|
||||
}
|
||||
return detailList;
|
||||
}
|
||||
|
||||
public static string GetTransitBuyerRefundStatusStr(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info itemTransitOrder)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(itemTransitOrder?.refund_status))
|
||||
{
|
||||
var pddBuyerAfterSale = orderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == itemTransitOrder.out_order_no);
|
||||
|
||||
// 店铺售后又取消的,如果是买手还没申请售后,不显示需手动申请售后文字
|
||||
if (itemTransitOrder.refund_status.Contains("需手动申请售后") && orderItem.refund_status <= 1)
|
||||
return "";
|
||||
// 显示售后金额(如果有)
|
||||
else if (itemTransitOrder.refund_status.EndsWith("买手退款成功"))
|
||||
{
|
||||
if (pddBuyerAfterSale?.refundAmount != null)
|
||||
return itemTransitOrder.refund_status + "(¥" + pddBuyerAfterSale.refundAmount * 0.01m + ")";
|
||||
else
|
||||
return itemTransitOrder.refund_status + "(退款金额待获取)";
|
||||
}
|
||||
else if (!itemTransitOrder.refund_status.Contains("需手动申请售后") && !itemTransitOrder.refund_status.Contains("已超过可申请售后的时间"))
|
||||
return "已申请售后 " + itemTransitOrder.refund_status.Replace("申请收到,", "");
|
||||
else
|
||||
return itemTransitOrder.refund_status;
|
||||
}
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 包裹相关信息
|
||||
/// </summary>
|
||||
public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
{
|
||||
public oms_wei_order_item_transit_detail_info()
|
||||
{
|
||||
Opacity = 1m;
|
||||
VoidPackageBtnVisibility = Visibility.Collapsed;
|
||||
RejectPackageBtnVisibility = Visibility.Collapsed;
|
||||
ReturnPackageBtnVisibility = Visibility.Collapsed;
|
||||
InterceptPackageBtnVisibility = Visibility.Collapsed;
|
||||
ExtraPackagesBtnVisibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
public oms_wei_order_item_info oms_wei_order_item_info { get; set; }
|
||||
public oms_wei_external_procurement_log_info oms_wei_external_procurement_log_info { get; set; }
|
||||
public oms_wei_external_procurement_after_sale_info oms_wei_external_procurement_after_sale_info { get; set; }
|
||||
public oms_wei_transfer_extra_package oms_wei_transfer_extra_package { get; set; }
|
||||
public oms_wei_external_procurement_log_info oms_wei_external_procurement_log_info { get; set; } /* 发货包裹 */
|
||||
public oms_wei_external_procurement_after_sale_info oms_wei_external_procurement_after_sale_info { get; set; } /* 退货包裹 */
|
||||
public oms_wei_transfer_extra_package oms_wei_transfer_extra_package { get; set; } /* 额外包裹 */
|
||||
|
||||
public decimal Opacity
|
||||
{
|
||||
get { return this.GetValue(x => x.Opacity); }
|
||||
set { this.SetValue(x => x.Opacity, value); }
|
||||
}
|
||||
|
||||
public string ShopName
|
||||
{
|
||||
@@ -392,13 +532,24 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
set { this.SetValue(x => x.ShopName, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 仓库类型 发货包裹 退货包裹
|
||||
/// </summary>
|
||||
/// <summary> 仓库类型: 发货包裹 退货包裹 额外包裹 </summary>
|
||||
public string TransitTypeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitTypeStr); }
|
||||
set { this.SetValue(x => x.TransitTypeStr, value); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.TransitTypeStr, value);
|
||||
TransitTypeStrColor = GlobalConfig.PurpleBrush;
|
||||
if (value == "退货包裹")
|
||||
TransitTypeStrColor = GlobalConfig.RedBrush;
|
||||
else if (value == "额外包裹")
|
||||
TransitTypeStrColor = GlobalConfig.GreenBrush;
|
||||
}
|
||||
}
|
||||
public SolidColorBrush TransitTypeStrColor
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitTypeStrColor); }
|
||||
set { this.SetValue(x => x.TransitTypeStrColor, value); }
|
||||
}
|
||||
|
||||
/// <summary> 仓库订单号 </summary>
|
||||
@@ -422,6 +573,11 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.WarehouseName); }
|
||||
set { this.SetValue(x => x.WarehouseName, value); }
|
||||
}
|
||||
public DateTime? CreateTime
|
||||
{
|
||||
get { return this.GetValue(x => x.CreateTime); }
|
||||
set { this.SetValue(x => x.CreateTime, value); CreateTimeStr = value == null ? null : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
|
||||
}
|
||||
public string CreateTimeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.CreateTimeStr); }
|
||||
@@ -497,7 +653,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.TransitStatus); }
|
||||
set { this.SetValue(x => x.TransitStatus, value); }
|
||||
}
|
||||
/// <summary> 仓库状态 </summary>
|
||||
/// <summary> 仓库状态文本: 未入库 已入库 已出库 拦截到仓</summary>
|
||||
public string WarehouseStatus
|
||||
{
|
||||
get { return this.GetValue(x => x.WarehouseStatus); }
|
||||
@@ -507,7 +663,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
public string TransitVoidStatus
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitVoidStatus); }
|
||||
set { this.SetValue(x => x.TransitVoidStatus, value); }
|
||||
set { this.SetValue(x => x.TransitVoidStatus, value); if (value == "已作废") this.Opacity = 0.6m; }
|
||||
}
|
||||
/// <summary> 拒收状态 </summary>
|
||||
public string TransitRejectStatus
|
||||
@@ -557,7 +713,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
public string InboundTimeStr
|
||||
{
|
||||
get { return this.GetValue(x => x.InboundTimeStr); }
|
||||
set { this.SetValue(x => x.InboundTimeStr, value); }
|
||||
set { this.SetValue(x => x.InboundTimeStr, value); }
|
||||
}
|
||||
public DateTime? OutboundTime
|
||||
{
|
||||
@@ -581,4 +737,65 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
|
||||
get { return this.GetValue(x => x.ShelfTimeStr); }
|
||||
set { this.SetValue(x => x.ShelfTimeStr, value); }
|
||||
}
|
||||
|
||||
public Visibility VoidPackageBtnVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.VoidPackageBtnVisibility); }
|
||||
set { this.SetValue(x => x.VoidPackageBtnVisibility, value); }
|
||||
}
|
||||
public Visibility RejectPackageBtnVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.RejectPackageBtnVisibility); }
|
||||
set { this.SetValue(x => x.RejectPackageBtnVisibility, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 直接退回包裹
|
||||
/// </summary>
|
||||
public Visibility ReturnPackageBtnVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.ReturnPackageBtnVisibility); }
|
||||
set { this.SetValue(x => x.ReturnPackageBtnVisibility, value); }
|
||||
}
|
||||
/// <summary>
|
||||
/// 拦截退回包裹
|
||||
/// </summary>
|
||||
public Visibility InterceptPackageBtnVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.InterceptPackageBtnVisibility); }
|
||||
set { this.SetValue(x => x.InterceptPackageBtnVisibility, value); }
|
||||
}
|
||||
public Visibility ExtraPackagesBtnVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.ExtraPackagesBtnVisibility); }
|
||||
set { this.SetValue(x => x.ExtraPackagesBtnVisibility, value); }
|
||||
}
|
||||
|
||||
public string TransitDetailRefundStatusStr
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitDetailRefundStatusStr); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.TransitDetailRefundStatusStr, value);
|
||||
|
||||
TransitDetailRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
|
||||
|
||||
if (value.Contains("退款成功"))
|
||||
TransitDetailRefundStatusBackColor = GlobalConfig.GreenBrush;
|
||||
else if (value.Contains("需手动申请售后") || value.Contains("已超过可申请售后的时间") || value.Contains("退款失败"))
|
||||
TransitDetailRefundStatusBackColor = GlobalConfig.RedBrush;
|
||||
else
|
||||
TransitDetailRefundStatusBackColor = GlobalConfig.LightOrangeBrush;
|
||||
}
|
||||
}
|
||||
public Visibility TransitDetailRefundStatusStrVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitDetailRefundStatusStrVisibility); }
|
||||
set { this.SetValue(x => x.TransitDetailRefundStatusStrVisibility, value); }
|
||||
}
|
||||
/// <summary> 中转仓买手售后字段文字显示背景颜色 </summary>
|
||||
public SolidColorBrush TransitDetailRefundStatusBackColor
|
||||
{
|
||||
get { return this.GetValue(x => x.TransitDetailRefundStatusBackColor); }
|
||||
set { this.SetValue(x => x.TransitDetailRefundStatusBackColor, value); }
|
||||
}
|
||||
}
|
||||
@@ -9,25 +9,58 @@ namespace AllBase.Model.DBModel;
|
||||
|
||||
public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
{
|
||||
public long id { get; set; } // 主键ID
|
||||
public string batchId { get; set; } // 新订单号
|
||||
public string order_no { get; set; } // 平台订单号
|
||||
public string buyer_account { get; set; } // '买家账号',
|
||||
public int? out_amount { get; set; } // '外部金额(分)',
|
||||
public string purchaser_note { get; set; } // '采购人备注'
|
||||
public string logistics_code { get; set; } // '快递公司',
|
||||
public string logistics_express_code { get; set; } // '快递单号',
|
||||
public string real_logistics_code // '出库快递公司',
|
||||
/// <summary>
|
||||
/// 主键ID
|
||||
/// </summary>
|
||||
public long id { get; set; }
|
||||
/// <summary>
|
||||
/// 新订单号
|
||||
/// </summary>
|
||||
public string batchId { get; set; }
|
||||
/// <summary>
|
||||
/// 平台订单号
|
||||
/// </summary>
|
||||
public string order_no { get; set; }
|
||||
/// <summary>
|
||||
/// 买家账号
|
||||
/// </summary>
|
||||
public string buyer_account { get; set; }
|
||||
/// <summary>
|
||||
/// 外部金额(分)
|
||||
/// </summary>
|
||||
public int? out_amount { get; set; }
|
||||
/// <summary>
|
||||
/// 采购人备注
|
||||
/// </summary>
|
||||
public string purchaser_note { get; set; }
|
||||
/// <summary>
|
||||
/// 快递公司
|
||||
/// </summary>
|
||||
public string logistics_code { get; set; }
|
||||
/// <summary>
|
||||
/// 快递单号
|
||||
/// </summary>
|
||||
public string logistics_express_code { get; set; }
|
||||
/// <summary>
|
||||
/// 出库快递公司
|
||||
/// </summary>
|
||||
public string real_logistics_code
|
||||
{
|
||||
get { return this.GetValue(x => x.real_logistics_code); }
|
||||
set { this.SetValue(x => x.real_logistics_code, value); }
|
||||
}
|
||||
public string real_logistics_express_code // '出库单号',
|
||||
}
|
||||
/// <summary>
|
||||
/// 出库单号
|
||||
/// </summary>
|
||||
public string real_logistics_express_code
|
||||
{
|
||||
get { return this.GetValue(x => x.real_logistics_express_code); }
|
||||
set { this.SetValue(x => x.real_logistics_express_code, value); }
|
||||
}
|
||||
public string refund_status { get; set; } // '买手退款状态',
|
||||
}
|
||||
/// <summary>
|
||||
/// 买手退款状态
|
||||
/// </summary>
|
||||
public string refund_status { get; set; }
|
||||
public DateTime? pickup_time { get; set; } // '取号时间',
|
||||
public int? transfer_warehouse_status { get; set; } // '中转仓状态:0 未使用,1 已创建,2 创建失败',
|
||||
public string raw_message { get; set; } // '原始消息/请求体',
|
||||
@@ -44,7 +77,10 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
public int? postage { get; set; } // '订单初始费用(分)',
|
||||
public int? retry_acquire_success { get; set; } // '重试取号是否成功 0=未尝试/未重试 1=成功 2=失败',
|
||||
public int? over_weight_fee { get; set; } // '超重费用',
|
||||
public string pack_type { get; set; } // '中转仓额外包裹类型 1商品2额外3礼品4退货',
|
||||
/// <summary>
|
||||
/// 中转仓额外包裹类型 1商品2额外3礼品4退货
|
||||
/// </summary>
|
||||
public string pack_type { get; set; }
|
||||
public DateTime? rejected_time { get; set; } // '拒收时间',
|
||||
public int? has_reject { get; set; } // DEFAULT NULL,
|
||||
public DateTime? blocked_arrival_time { get; set; }
|
||||
@@ -56,4 +92,40 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
/// 货架写入时间
|
||||
/// </summary>
|
||||
public DateTime? location_write_time { get; set; }
|
||||
/// <summary>
|
||||
/// 外采单号
|
||||
/// </summary>
|
||||
public string out_order_no { get; set; }
|
||||
/// <summary>
|
||||
/// 商品skuId
|
||||
/// </summary>
|
||||
public string out_sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截退回状态:0未处理,1已退回成功,2退回失败(或其它业务码)
|
||||
/// </summary>
|
||||
public int? intercept_return_status { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截退回时间
|
||||
/// </summary>
|
||||
public DateTime? intercept_return_time { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截退回操作信息(回调/失败信息/备注等)
|
||||
/// </summary>
|
||||
public string intercept_return_info { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截改地址状态:0未处理,1修改成功,2修改失败(或其它业务码)
|
||||
/// </summary>
|
||||
public int? intercept_address_status { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截改地址时间
|
||||
/// </summary>
|
||||
public DateTime? intercept_address_time { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截改地址操作信息(回调/失败信息/备注等)
|
||||
/// </summary>
|
||||
public string intercept_address_info { get; set; }
|
||||
/// <summary>
|
||||
/// 是否有退货:0 无退货,1 有退货
|
||||
/// </summary>
|
||||
public int? has_return { get; set; }
|
||||
}
|
||||
@@ -69,23 +69,41 @@ namespace AllBase.Model.DBModel
|
||||
|
||||
public enum EnumOrderPaymentType
|
||||
{
|
||||
充值 = 1,
|
||||
//采购花费 = 2,
|
||||
//产品退款到账 = 3,
|
||||
//运费退款到账 = 4,
|
||||
//采购收款 = 5,
|
||||
//产品退款扣除 = 6,
|
||||
//运费退款扣除 = 7,
|
||||
礼物单支出 = 16,
|
||||
中转仓扣费支出 = 20,
|
||||
中转仓作废收入 = 23,
|
||||
中转仓超重支出 = 24,
|
||||
//变动类型,1:充值,2:采购花费,3:产品退款到账,4:运费退款到账,5:采购收款,6:产品退款扣除,7:运费退款扣除, 16:礼物单话费,20:中转仓扣费支出,23:中转仓退款收入,24:中转仓超重扣费支出,26 退货包裹扣费支出30支付宝充值;31 云仓退货支出33 分销退货包裹超重花费32 分销退货包裹发货花费退款34 礼物单退费35 额外包裹创建36 额外包裹作废37 额外订单超重支出38 退货包裹作废返还55 同步物流支出
|
||||
|
||||
充值 = 1,
|
||||
//采购花费 = 2,
|
||||
//产品退款到账 = 3,
|
||||
//运费退款到账 = 4,
|
||||
//采购收款 = 5,
|
||||
//产品退款扣除 = 6,
|
||||
//运费退款扣除 = 7,
|
||||
礼物单支出 = 16,
|
||||
|
||||
发货包裹扣费支出 = 20,
|
||||
发货包裹作废返还 = 23,
|
||||
发货包裹超重支出 = 24,
|
||||
|
||||
退货包裹扣费支出 = 26,
|
||||
支付宝在线充值 = 30,
|
||||
云仓退货支出 = 31,
|
||||
退货包裹超重支出 = 28,
|
||||
退货包裹作废返还 = 38,
|
||||
|
||||
支付宝在线充值 = 30,
|
||||
|
||||
退货仓退货支出 = 31,
|
||||
退货仓作废返还 = 32,
|
||||
退货仓超重支出 = 33,
|
||||
|
||||
礼物单退费 = 34,
|
||||
额外订单创建 = 35,
|
||||
额外订单作废 = 36,
|
||||
|
||||
额外包裹创建支出 = 35,
|
||||
额外包裹作废返还 = 36,
|
||||
额外包裹超重支出 = 37,
|
||||
|
||||
额外包裹退货拦截创建支出 = 39,
|
||||
额外包裹退货拦截作废返还 = 40,
|
||||
额外包裹退货拦截超重支出 = 41,
|
||||
|
||||
同步物流 = 55,
|
||||
}
|
||||
|
||||
|
||||
@@ -185,13 +185,13 @@ namespace AllBase.Model.Result
|
||||
get { return this.GetValue(x => x.thumbUrl); }
|
||||
set { this.SetValue(x => x.thumbUrl, value); }
|
||||
} // "https://t00img.yangkeduo.com/t10img/images/2018-06-09/5c7746a3608e75a2b65926f4ed0f34cb.jpeg",
|
||||
public int? initQuantity { get; set; } // 0,
|
||||
public int? quantity { get; set; } // 1000,
|
||||
public int? limitQuantity { get; set; } // 999999,
|
||||
public int? soldQuantity { get; set; } // 0,
|
||||
public int? hotSale { get; set; } // 1,
|
||||
public int? defaultQuantity { get; set; } // 100,
|
||||
public int? isOnsale { get; set; } // 1,
|
||||
//public int? initQuantity { get; set; } // 0,
|
||||
//public int? quantity { get; set; } // 1000,
|
||||
//public int? limitQuantity { get; set; } // 999999,
|
||||
//public int? soldQuantity { get; set; } // 0,
|
||||
//public int? hotSale { get; set; } // 1,
|
||||
//public int? defaultQuantity { get; set; } // 100,
|
||||
//public int? isOnsale { get; set; } // 1,
|
||||
public string spec { get; set; } // "677094835",
|
||||
[JsonIgnore]
|
||||
public string SpecNameStr
|
||||
@@ -216,17 +216,17 @@ namespace AllBase.Model.Result
|
||||
public string normalPrice { get; set; } // "14.5",
|
||||
public string groupPrice { get; set; } // "13.5",
|
||||
public int? oldGroupPrice { get; set; } // 1350,
|
||||
public int? marketPrice { get; set; } // 0,
|
||||
public int? weight { get; set; } // 2500,
|
||||
public List<yellowLabelListInfo> yellowLabelList { get; set; }
|
||||
public int? previewPriority { get; set; } // 0,
|
||||
public int? startTime { get; set; } // 0,
|
||||
public int? endTime { get; set; } // 0,
|
||||
public int? staticLimitQuantity { get; set; } // 999999,
|
||||
public string attribute { get; set; } // "{\"skuPreSaleTime\":0}",
|
||||
public string normalSavePrice { get; set; } // "1",
|
||||
public long? skuID { get; set; } // 28790184768,
|
||||
public string skuExpansionPrice { get; set; } // "0"
|
||||
//public int? marketPrice { get; set; } // 0,
|
||||
//public int? weight { get; set; } // 2500,
|
||||
//public List<yellowLabelListInfo> yellowLabelList { get; set; }
|
||||
//public int? previewPriority { get; set; } // 0,
|
||||
//public int? startTime { get; set; } // 0,
|
||||
//public int? endTime { get; set; } // 0,
|
||||
//public int? staticLimitQuantity { get; set; } // 999999,
|
||||
//public string attribute { get; set; } // "{\"skuPreSaleTime\":0}",
|
||||
//public string normalSavePrice { get; set; } // "1",
|
||||
//public long? skuID { get; set; } // 28790184768,
|
||||
//public string skuExpansionPrice { get; set; } // "0"
|
||||
}
|
||||
|
||||
public class yellowLabelListInfo
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AllBase.Util;
|
||||
|
||||
public class ChineseStringConverter
|
||||
{
|
||||
private const int LCMAP_SIMPLIFIED_CHINESE = 0x02000000;
|
||||
private const int LCMAP_TRADITIONAL_CHINESE = 0x04000000;
|
||||
|
||||
[DllImport("kernel32", CharSet = CharSet.Auto, SetLastError = true)]
|
||||
private static extern int LCMapString(int Locale, int dwMapFlags, string lpSrcStr, int cchSrc, [Out] string lpDestStr, int cchDest);
|
||||
|
||||
public static string ToSimplified(string source)
|
||||
{
|
||||
string target = new string(' ', source.Length);
|
||||
LCMapString(0x0800, LCMAP_SIMPLIFIED_CHINESE, source, source.Length, target, source.Length);
|
||||
return target;
|
||||
}
|
||||
|
||||
public static string ToTraditional(string source)
|
||||
{
|
||||
string target = new string(' ', source.Length);
|
||||
LCMapString(0x0800, LCMAP_TRADITIONAL_CHINESE, source, source.Length, target, source.Length);
|
||||
return target;
|
||||
}
|
||||
}
|
||||
@@ -164,6 +164,11 @@
|
||||
CornerRadius="5"
|
||||
Cursor="Hand"
|
||||
ToolTip="{Binding ToolTipText}">
|
||||
<Border.ContextMenu>
|
||||
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
||||
<MenuItem Header="复制图片" Click="CopyImage_Click" />
|
||||
</ContextMenu>
|
||||
</Border.ContextMenu>
|
||||
<Border.InputBindings>
|
||||
<MouseBinding
|
||||
Command="{Binding Source={StaticResource ShowImageCommand}}"
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
using _29WxOrderWpf.ToolCtrls;
|
||||
using OrderSupportTicket.ViewModels;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media.Imaging;
|
||||
using Work._29Tools.Forms.ToolForms;
|
||||
|
||||
namespace OrderSupportTicket.Views;
|
||||
@@ -9,6 +11,23 @@ namespace OrderSupportTicket.Views;
|
||||
public partial class TicketConversationView : UserControl
|
||||
{
|
||||
public TicketConversationView() => InitializeComponent();
|
||||
|
||||
private void CopyImage_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
e.Handled = true;
|
||||
var window = Window.GetWindow(this);
|
||||
if (window == null) return;
|
||||
if (sender is not MenuItem { DataContext: ChatAttachmentViewModel attachment }) return;
|
||||
if (attachment.Image is not BitmapSource bitmap)
|
||||
{
|
||||
ToastHelper.Show(window, "图片尚未加载成功,无法复制");
|
||||
return;
|
||||
}
|
||||
|
||||
var data = new DataObject(DataFormats.Bitmap, bitmap);
|
||||
ToastHelper.Show(window, ClipboardHelper.TrySetData(data) ? "图片已复制" : "图片复制失败,请重试");
|
||||
}
|
||||
|
||||
private void CopyOrderId_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
if (sender is not FrameworkElement element || element.Tag is not string orderId || string.IsNullOrWhiteSpace(orderId)) return;
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Work.Extension;
|
||||
|
||||
public static class ConvertExtension
|
||||
{
|
||||
#region 转换为string
|
||||
/// <summary>
|
||||
/// 将object转换为string,若转换失败,则返回string.Empty。不抛出异常。
|
||||
/// </summary>
|
||||
/// <param name="obj"></param>
|
||||
/// <returns></returns>
|
||||
public static string ParseToStr(this object obj)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (obj == null)
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (obj is DateTime dt)
|
||||
return dt.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
return obj.ToString();
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
public static string ParseToNullableStr(this object obj)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (obj == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (obj is DateTime dt)
|
||||
return dt.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
return obj.ToString();
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static string ParseToStrs<T>(this object obj, string split = ",")
|
||||
{
|
||||
try
|
||||
{
|
||||
var list = obj as IEnumerable<T>;
|
||||
if (list != null)
|
||||
{
|
||||
return string.Join(split, list);
|
||||
}
|
||||
else
|
||||
{
|
||||
return obj.ToString();
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
@@ -126,7 +126,17 @@ namespace Work
|
||||
BaseClass.ParentUserName = BaseRegex.GetStringJson(ref html, "parent_user_name");
|
||||
BaseClass.SaLevel = BaseRegex.GetIntJson(ref html, "sa_level").ParseToInt();
|
||||
BaseClass.UserAuthority = BaseRegex.GetStringJson(ref html, "authority").ParseToString();
|
||||
|
||||
if (BaseClass.UserAuthority != null && BaseClass.UserAuthority.Contains("繁体地址"))
|
||||
BaseClass.Setting.ShowEnablePddTransitTraditionalAddress = true;
|
||||
else
|
||||
{
|
||||
BaseClass.Setting.ShowEnablePddTransitTraditionalAddress = false;
|
||||
BaseClass.Setting.SwitchEnablePddTransitTraditionalAddress = false;
|
||||
}
|
||||
|
||||
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.Mobile = BaseRegex.GetStringJson(ref html, "mobile");
|
||||
BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt();
|
||||
|
||||
@@ -13,7 +13,8 @@ namespace Work._29Tools.BLL
|
||||
{
|
||||
public class HttpResponseTransitWorkOrderBLL
|
||||
{
|
||||
public static string WorkOrderUrl { get; set; } = "http://14.103.99.254";
|
||||
//public static string WorkOrderUrl { get; set; } = "http://14.103.99.254";
|
||||
public static string WorkOrderUrl { get; set; } = "https://ai.e57.cn";
|
||||
public static string PostResponse(ShopLoginInfo shop, string _url, string _body, string referer)
|
||||
{
|
||||
|
||||
@@ -80,6 +81,71 @@ namespace Work._29Tools.BLL
|
||||
return result;
|
||||
}
|
||||
|
||||
public static async Task<string> PostResponseAsync(ShopLoginInfo shop, string _url, string _body, string referer)
|
||||
{
|
||||
string cookies = "";
|
||||
try
|
||||
{
|
||||
var cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>((shop?.Cookies).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.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.ContentType = "application/json";
|
||||
request.Accept = "*/*";
|
||||
request.Headers.Add("Origin", WorkOrderUrl);
|
||||
request.Headers.Add("X-Api-Key", "rwo_vmRcWpEFIB9zSTRkXoKSeTpq.ihFaJR7SPFi6GsmKtkorSKo-uj3IsYAvhJQI7lLKu1M");
|
||||
request.Referer = referer;
|
||||
request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
|
||||
request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
|
||||
if (!string.IsNullOrEmpty(cookies))
|
||||
request.Headers.Set(HttpRequestHeader.Cookie, cookies);
|
||||
|
||||
request.Method = "POST";
|
||||
request.ServicePoint.Expect100Continue = false;
|
||||
|
||||
string body = _body;
|
||||
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 GetResponse(ShopLoginInfo shop, string _url, string referer)
|
||||
{
|
||||
|
||||
|
||||
@@ -569,6 +569,9 @@ namespace Work._29Tools.BLL
|
||||
//if (string.IsNullOrEmpty(Authorization)) Authorization = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQ3YmRlOGNlLWY5MDUtNDIzOS05M2VjLWZiN2U3MjRmOTY0NiJ9.vwxhj3t4zTDdBQTyfVjcKr-0Oma8-VtPDzE2LVkw4A4aWftncY1ikXgEhGwoYHn9E7yOnhS_Pb7FfzgecTqqHA";
|
||||
|
||||
bool isRetry = false;
|
||||
|
||||
Retry:
|
||||
|
||||
if (string.IsNullOrEmpty(sAuthorization))
|
||||
{
|
||||
var url3 = BaseClass.Build29WxObjString("user/get_e57_authorization");
|
||||
@@ -579,8 +582,6 @@ namespace Work._29Tools.BLL
|
||||
sAuthorization = BaseRegex.GetStringJson(ref html3, "authorization");
|
||||
}
|
||||
|
||||
Retry:
|
||||
|
||||
HttpWebResponse response = null;
|
||||
string result;
|
||||
try
|
||||
@@ -599,13 +600,7 @@ namespace Work._29Tools.BLL
|
||||
request = (HttpWebRequest)WebRequest.Create(url);
|
||||
|
||||
request.KeepAlive = true;
|
||||
//request.Headers.Set(HttpRequestHeader.CacheControl, "max-age=0");
|
||||
//request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36";
|
||||
request.ContentType = "application/json";
|
||||
//request.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7"; //request.Accept = "*/*";
|
||||
//request.Referer = referer;
|
||||
//request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
|
||||
//request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
|
||||
request.Headers.Add("sec-ch-ua", @"""Not(A:Brand"";v=""8"", ""Chromium"";v=""144"", ""Google Chrome"";v=""144""");
|
||||
request.Headers.Add("sec-ch-ua-mobile", @"?0");
|
||||
request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
|
||||
@@ -650,7 +645,7 @@ namespace Work._29Tools.BLL
|
||||
return e.Message;
|
||||
}
|
||||
result = HttpResponseBLL.ReadResponse(response);
|
||||
if (result.Contains("没有Authorization") && !isRetry)
|
||||
if ((result.Contains("没有Authorization") || result.Contains("授权过期")) && !isRetry)
|
||||
{
|
||||
isRetry = true;
|
||||
sAuthorization = "";
|
||||
@@ -666,6 +661,9 @@ namespace Work._29Tools.BLL
|
||||
////if (string.IsNullOrEmpty(Authorization)) Authorization = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQ3YmRlOGNlLWY5MDUtNDIzOS05M2VjLWZiN2U3MjRmOTY0NiJ9.vwxhj3t4zTDdBQTyfVjcKr-0Oma8-VtPDzE2LVkw4A4aWftncY1ikXgEhGwoYHn9E7yOnhS_Pb7FfzgecTqqHA";
|
||||
|
||||
bool isRetry = false;
|
||||
|
||||
Retry:
|
||||
|
||||
if (string.IsNullOrEmpty(sAuthorization))
|
||||
{
|
||||
var url3 = BaseClass.Build29WxObjString("user/get_e57_authorization");
|
||||
@@ -676,8 +674,6 @@ namespace Work._29Tools.BLL
|
||||
sAuthorization = BaseRegex.GetStringJson(ref html3, "authorization");
|
||||
}
|
||||
|
||||
Retry:
|
||||
|
||||
HttpWebResponse response = null;
|
||||
string result;
|
||||
try
|
||||
@@ -732,7 +728,7 @@ namespace Work._29Tools.BLL
|
||||
return e.Message;
|
||||
}
|
||||
result = HttpResponseBLL.ReadResponse(response);
|
||||
if (result.Contains("没有Authorization") && !isRetry)
|
||||
if ((result.Contains("没有Authorization") || result.Contains("授权过期")) && !isRetry)
|
||||
{
|
||||
isRetry = true;
|
||||
sAuthorization = "";
|
||||
@@ -744,6 +740,9 @@ namespace Work._29Tools.BLL
|
||||
public static string e57GetResponse(string _url, string referer)
|
||||
{
|
||||
bool isRetry = false;
|
||||
|
||||
Retry:
|
||||
|
||||
if (string.IsNullOrEmpty(sAuthorization))
|
||||
{
|
||||
var url3 = BaseClass.Build29WxObjString("user/get_e57_authorization");
|
||||
@@ -753,7 +752,6 @@ namespace Work._29Tools.BLL
|
||||
html3 = GetHtml.PostUtf8(url3, data3);
|
||||
sAuthorization = BaseRegex.GetStringJson(ref html3, "authorization");
|
||||
}
|
||||
Retry:
|
||||
|
||||
HttpWebResponse response = null;
|
||||
string result;
|
||||
@@ -808,7 +806,7 @@ namespace Work._29Tools.BLL
|
||||
return e.Message;
|
||||
}
|
||||
result = HttpResponseBLL.ReadResponse(response);
|
||||
if (result.Contains("没有Authorization") && !isRetry)
|
||||
if ((result.Contains("没有Authorization") || result.Contains("授权过期")) && !isRetry)
|
||||
{
|
||||
isRetry = true;
|
||||
sAuthorization = "";
|
||||
|
||||
@@ -85,7 +85,77 @@ namespace Work._29Tools.BLL
|
||||
return result;
|
||||
}
|
||||
|
||||
public static string YangkeduoGetResponse(BuyerLoginInfo buyer, string _url, string referer = "")
|
||||
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 = "")
|
||||
{
|
||||
string cookies = "";
|
||||
try
|
||||
|
||||
@@ -163,7 +163,16 @@ namespace Work._29Tools.BLL
|
||||
return html;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 绑定代发
|
||||
/// </summary>
|
||||
/// <param name="shop"></param>
|
||||
/// <param name="orderId"></param>
|
||||
/// <param name="spuId"></param>
|
||||
/// <param name="skuId"></param>
|
||||
/// <param name="cnt"></param>
|
||||
/// <param name="supplier_appid"></param>
|
||||
/// <returns></returns>
|
||||
public string WxApiDropshipAssign(ShopLoginInfo shop, string orderId, string spuId, string skuId, int cnt, string supplier_appid = null)
|
||||
{
|
||||
bool IsRetry = false;
|
||||
@@ -190,6 +199,13 @@ namespace Work._29Tools.BLL
|
||||
return html;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 取消代发
|
||||
/// </summary>
|
||||
/// <param name="shop"></param>
|
||||
/// <param name="order"></param>
|
||||
/// <param name="dropShopOrderId"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<string> WxApiDropshipCancel(ShopLoginInfo shop, oms_wei_order_info order, string dropShopOrderId)
|
||||
{
|
||||
bool IsRetry = false;
|
||||
@@ -221,6 +237,12 @@ namespace Work._29Tools.BLL
|
||||
return html;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 查询并取消代发
|
||||
/// </summary>
|
||||
/// <param name="shop"></param>
|
||||
/// <param name="order"></param>
|
||||
/// <returns></returns>
|
||||
public static async Task<string> WxSearchAndDropshipCancelAsync(ShopLoginInfo shop, oms_wei_order_info order)
|
||||
{
|
||||
string orderId = order.order_id;
|
||||
|
||||
@@ -4,6 +4,7 @@ using AllBase.Model;
|
||||
using AllBase.Model.Config;
|
||||
using AllBase.Model.DBModel;
|
||||
using AllBase.Model.Result;
|
||||
using AllBase.Util;
|
||||
using CefSharp;
|
||||
using CefSharp.DevTools;
|
||||
using CefSharp.DevTools.IO;
|
||||
@@ -90,19 +91,61 @@ namespace TemuKJD.ToolForms
|
||||
// 订单仓库
|
||||
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;
|
||||
|
||||
string _txtBuyTransitWarehouseStr = "";
|
||||
/// <summary>
|
||||
/// 拍单中转地址
|
||||
/// </summary>
|
||||
string txtBuyTransitWarehouseStr = "";
|
||||
string txtBuyTransitWarehouseStr
|
||||
{
|
||||
get { return _txtBuyTransitWarehouseStr; }
|
||||
set
|
||||
{
|
||||
if (!string.IsNullOrEmpty(value) && BuyType == "transit")
|
||||
{
|
||||
//txtBuyTransitWarehouseRandomStr = value;
|
||||
var numberDic = TransitWarehouseData.dicChineseNumberChar;
|
||||
var txtBuyTransitWarehouseRandomStrTmp = txtBuyTransitWarehouseRandomStr = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室";
|
||||
|
||||
//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++)
|
||||
{
|
||||
txtBuyTransitWarehouseRandomStrTmp = string.Join("", txtBuyTransitWarehouseRandomStrTmp.Select(c => Randomx.GetId(2) == 0 ? c.ToString() : ChineseStringConverter.ToTraditional(c.ToString())));
|
||||
txtBuyTransitWarehouseRandomStrTmp = string.Join("", txtBuyTransitWarehouseRandomStrTmp.Select(c => (Randomx.GetId(2) == 0 || !numberDic.Keys.Contains(c)) ? c : numberDic[c][Randomx.GetId(numberDic[c].Count)]));
|
||||
}
|
||||
txtBuyTransitWarehouseRandomStr = txtBuyTransitWarehouseRandomStrTmp;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
txtBuyTransitWarehouseRandomStr = value;
|
||||
}
|
||||
_txtBuyTransitWarehouseStr = value;
|
||||
}
|
||||
}
|
||||
string txtBuyTransitWarehouseRandomStr = "";
|
||||
bool IsChangeAddress = 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, Action updateBalance, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -172,6 +215,7 @@ namespace TemuKJD.ToolForms
|
||||
}
|
||||
|
||||
if (this.Created)
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
//this.pnlMask.Visible = false;
|
||||
@@ -179,6 +223,7 @@ namespace TemuKJD.ToolForms
|
||||
this.pnlMask.Dock = DockStyle.Bottom;
|
||||
this.pnlMask.Height = 120;
|
||||
}));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -341,13 +386,16 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
}
|
||||
|
||||
private async void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e)
|
||||
private void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e)
|
||||
{
|
||||
if (!this.IsClose && this.Created && !this.Disposing && !this.IsDisposed)
|
||||
Task.Run(() =>
|
||||
{
|
||||
currentUrl = e.Address;
|
||||
Invoke(() => { txtAddress.Text = e.Address; });
|
||||
}
|
||||
if (!this.IsClose && this.Created && !this.Disposing && !this.IsDisposed)
|
||||
{
|
||||
Invoke(() => { txtAddress.Text = e.Address; });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void CefWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e)
|
||||
@@ -372,12 +420,16 @@ namespace TemuKJD.ToolForms
|
||||
jObj["province_id"] = transitWarehouse.province_id;
|
||||
jObj["city_id"] = transitWarehouse.city_id;
|
||||
jObj["district_id"] = transitWarehouse.district_id;
|
||||
jObj["address"] = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室" + txtSourceCode.Text;
|
||||
//jObj["address"] = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室" + txtSourceCode.Text;
|
||||
jObj["address"] = txtBuyTransitWarehouseRandomStr + txtSourceCode.Text;
|
||||
jObj["mobile"] = TransitWaybillHelper.MobileHead[Randomx.GetId(TransitWaybillHelper.MobileHead.Count)] + Randomx.GetNumber(8);
|
||||
jObj["name"] = TransitWaybillHelper.LastName[Randomx.GetId(TransitWaybillHelper.LastName.Count)] + (Randomx.GetId(2) == 1 ? "先生" : "女士");
|
||||
postData = JsonHelper.SerializeObject(jObj);
|
||||
request.PostData.Elements[0].Bytes = System.Text.Encoding.UTF8.GetBytes(postData);
|
||||
Invoke(() => { this.pnlMask.Visible = false; });
|
||||
Task.Run(() =>
|
||||
{
|
||||
Invoke(() => { this.pnlMask.Visible = false; });
|
||||
});
|
||||
}
|
||||
else if (BuyType == "direct" && orderItem?.ItemOrder?.AddressStr.Contains("******") == false)
|
||||
{
|
||||
@@ -396,7 +448,10 @@ namespace TemuKJD.ToolForms
|
||||
jObj["name"] = orderItem.ItemOrder.user_name;
|
||||
postData = JsonHelper.SerializeObject(jObj);
|
||||
request.PostData.Elements[0].Bytes = System.Text.Encoding.UTF8.GetBytes(postData);
|
||||
Invoke(() => { this.pnlMask.Visible = false; });
|
||||
Task.Run(() =>
|
||||
{
|
||||
Invoke(() => { this.pnlMask.Visible = false; });
|
||||
});
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -470,6 +525,8 @@ namespace TemuKJD.ToolForms
|
||||
sendProvince = data.Substring(sendProvinceIndex + "{\"key\":\"发货地\",\"values\":[".Length);
|
||||
sendProvince = sendProvince.Substring(0, sendProvince.IndexOf("]"));
|
||||
sendProvince = sendProvince.Trim('\"');
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() => { this.txtSendProvince.Text = sendProvince; }));
|
||||
}
|
||||
|
||||
@@ -494,6 +551,8 @@ namespace TemuKJD.ToolForms
|
||||
if (buyPrice.IsNullOrZero())
|
||||
buyPrice = BaseRegex.GetIntJson(ref data, "orderAmount");
|
||||
var orderSn = BaseRegex.GetIntJson(ref data, "orderSn");
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
// 自动填写关联信息界面
|
||||
@@ -595,6 +654,8 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (AbnormalTransitWarehouseOrderInfo != null)
|
||||
{
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() => { txtSourceCode.Text = AbnormalTransitWarehouseOrderInfo.random_code; }));
|
||||
}
|
||||
else
|
||||
@@ -602,6 +663,8 @@ namespace TemuKJD.ToolForms
|
||||
var sourceCodeRst = GetSourceCode(transit);
|
||||
if (sourceCodeRst.Contains("失败"))
|
||||
{
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (cefWebBrowser != null)
|
||||
@@ -614,7 +677,7 @@ namespace TemuKJD.ToolForms
|
||||
}
|
||||
|
||||
// 填地址
|
||||
var rst = await ChangeAddress(transit);
|
||||
var rst = await ChangeAddress(transit);
|
||||
|
||||
// 领优惠券
|
||||
await AutoGetCoupon();
|
||||
@@ -632,6 +695,8 @@ namespace TemuKJD.ToolForms
|
||||
url.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/van-spike/prepay?pdduid="))
|
||||
{
|
||||
var data = postData;
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
txtBuyOrderId.Text = BaseRegex.GetStringJsonByRegs(ref data, "", "order_sn", "orderSn");
|
||||
@@ -643,6 +708,8 @@ namespace TemuKJD.ToolForms
|
||||
var uri = url;
|
||||
var pData = postData;
|
||||
var rData = responseData;
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
btnManualUpdateBuyOrder_Click(null, null);
|
||||
@@ -837,12 +904,13 @@ namespace TemuKJD.ToolForms
|
||||
var randomCode = BaseRegex.GetStringXml(ref sourceCodeRst, "randomCode");
|
||||
if (!string.IsNullOrEmpty(randomCode))
|
||||
{
|
||||
Invoke(new Action(() => { txtSourceCode.Text = randomCode; }));
|
||||
if (this.Created)
|
||||
Invoke(new Action(() => { txtSourceCode.Text = randomCode; }));
|
||||
return randomCode;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
|
||||
return "溯源码获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1005,7 +1073,7 @@ namespace TemuKJD.ToolForms
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
|
||||
for (i = elements.length - 1; i >= 0; i--){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('" + txtBuyTransitWarehouseStr + @"') >= 0 && element.innerHTML.indexOf('" + txtSourceCode.Text.Trim() + @"') >= 0) {
|
||||
if (element.innerHTML.indexOf('" + txtBuyTransitWarehouseRandomStr + @"') >= 0 && element.innerHTML.indexOf('" + txtSourceCode.Text.Trim() + @"') >= 0) {
|
||||
element.click();
|
||||
return 'success';
|
||||
}
|
||||
@@ -1066,6 +1134,8 @@ namespace TemuKJD.ToolForms
|
||||
}
|
||||
if (warehouseParam.TransFullAddress.Contains(sendProvince))
|
||||
{
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
cmbTransitWarehouse.Text = warehouseParam.TransName + " " + warehouseParam.TransFullAddress;
|
||||
@@ -1078,6 +1148,8 @@ namespace TemuKJD.ToolForms
|
||||
if (!isAutoGetWarehouse)
|
||||
{
|
||||
//黄导家庭父母5天训练营-《父母5天成为孩子成长的引路人》+《不内卷养育》2本书
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(() =>
|
||||
{
|
||||
cmbTransitWarehouse.Text = "";
|
||||
@@ -1348,8 +1420,8 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("溯源码长度错误!");
|
||||
else
|
||||
Invoke(() => { lblErrMsg.Text = "溯源码长度错误!"; });
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "溯源码长度错误!"; });
|
||||
return;
|
||||
}
|
||||
var client = cefWebBrowser?.GetDevToolsClient();
|
||||
@@ -1357,7 +1429,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("页面未加载!");
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "页面未加载!"; });
|
||||
return;
|
||||
}
|
||||
@@ -1386,7 +1458,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("缺少中转地址,请重新绑定商品并选择仓库地址");
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "缺少中转地址,请重新绑定商品并选择仓库地址"; });
|
||||
return;
|
||||
}
|
||||
@@ -1395,7 +1467,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("中转地址对应的中转仓不存在,请核对");
|
||||
else
|
||||
else if(this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "中转地址对应的中转仓不存在,请核对"; });
|
||||
return;
|
||||
}
|
||||
@@ -1403,7 +1475,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("缺少拍单订单号,请拍单后再提交");
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "缺少拍单订单号,请拍单后再提交"; });
|
||||
return;
|
||||
}
|
||||
@@ -1411,7 +1483,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("缺少拍单金额,请拍单后再提交");
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "缺少拍单金额,请拍单后再提交"; });
|
||||
return;
|
||||
}
|
||||
@@ -1450,27 +1522,22 @@ namespace TemuKJD.ToolForms
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +
|
||||
// ",\"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>订单不存在: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 code = "";
|
||||
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();
|
||||
}
|
||||
msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
|
||||
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("拍单保存失败,服务端返回 " + msg, "拍单信息保存失败");
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "拍单保存失败,服务端返回 " + msg; });
|
||||
btnManualUpdateBuyOrder.Enabled = true;
|
||||
return;
|
||||
@@ -1483,10 +1550,13 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
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,
|
||||
});
|
||||
@@ -1498,7 +1568,7 @@ namespace TemuKJD.ToolForms
|
||||
order.SetOrderTextProperty();
|
||||
if (filterOrderAction != null && order != null)
|
||||
{
|
||||
filterOrderAction(order, true);
|
||||
await filterOrderAction(order, true);
|
||||
}
|
||||
|
||||
//// 前一天的订单直接提前取号
|
||||
@@ -1531,7 +1601,7 @@ namespace TemuKJD.ToolForms
|
||||
// }
|
||||
// if (!IsAutoBuy)
|
||||
// BaseMsgForm.ShowError("拍单信息保存成功,接收到服务端传递的错误消息:" + msg, "订单提前取号失败");
|
||||
// else
|
||||
// else if (this.Created)
|
||||
// Invoke(() => { lblErrMsg.Text = "拍单信息保存成功,接收到服务端传递的错误消息:" + msg; });
|
||||
// btnManualUpdateBuyOrder.Enabled = true;
|
||||
// return;
|
||||
@@ -1586,7 +1656,7 @@ namespace TemuKJD.ToolForms
|
||||
var order = orderItem?.ItemOrder;
|
||||
if (filterOrderAction != null && order != null)
|
||||
{
|
||||
filterOrderAction(order, true);
|
||||
await filterOrderAction(order, true);
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -1599,6 +1669,15 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
#region 直发拍单
|
||||
|
||||
if (orderItem.ItemOrder?.Shop == null)
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("缺少店铺信息!");
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "缺少店铺信息!"; });
|
||||
return;
|
||||
}
|
||||
|
||||
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&wx_order_id_in=" + orderItem.order_id;
|
||||
@@ -1610,7 +1689,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("直发拍单信息保存失败(01) " + BaseRegex.GetStringJson(ref html, "msg"));
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "直发拍单信息保存失败(01) " + BaseRegex.GetStringJson(ref html, "msg"); });
|
||||
return;
|
||||
}
|
||||
@@ -1620,8 +1699,8 @@ namespace TemuKJD.ToolForms
|
||||
order_id = orderItem.order_id,
|
||||
sku_id = orderItem.sku_id,
|
||||
out_order_id = txtBuyOrderId.Text.Trim(),
|
||||
shop_app_id = orderItem.Shop.ShopId,
|
||||
shop_name = orderItem.Shop.ShopAccount,
|
||||
shop_app_id = orderItem.ItemOrder?.Shop?.ShopId,
|
||||
shop_name = orderItem.ItemOrder?.Shop?.ShopAccount,
|
||||
buy_type = "直发",
|
||||
};
|
||||
var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info");
|
||||
@@ -1639,7 +1718,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("直发拍单信息保存失败(02) " + BaseRegex.GetStringJson(ref html1, "msg"));
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "直发拍单信息保存失败(02) " + BaseRegex.GetStringJson(ref html, "msg"); });
|
||||
return;
|
||||
}
|
||||
@@ -1656,7 +1735,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("直发拍单信息保存失败(03) " + BaseRegex.GetStringJson(ref html2, "msg"));
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "直发拍单信息保存失败(03) " + BaseRegex.GetStringJson(ref html, "msg"); });
|
||||
return;
|
||||
}
|
||||
@@ -1706,7 +1785,7 @@ namespace TemuKJD.ToolForms
|
||||
//NaiBa.Util.Helper.ConfigHelper.SaveConfig("other_buyer_order_list", lstOtherBuyerOrderInfoLite);
|
||||
if (!IsAutoBuy)
|
||||
BaseMsgForm.ShowError("直发拍单保存失败,服务端返回 " + msg, "拍单信息保存失败");
|
||||
else
|
||||
else if (this.Created)
|
||||
Invoke(() => { lblErrMsg.Text = "直发拍单保存失败,服务端返回 " + msg; });
|
||||
return;
|
||||
}
|
||||
|
||||
+658
-656
File diff suppressed because it is too large.
Load diff
@@ -141,57 +141,81 @@ namespace Work._29Tools.Forms.UserForms
|
||||
}
|
||||
|
||||
private List<user_payment_record> paymentList;
|
||||
public async void GetBalanceList()
|
||||
private string GetBalanceFilters()
|
||||
{
|
||||
int pageCount = 1;
|
||||
int pageSize = 50;
|
||||
var data3 = "&user_name_in=" + BaseClass.UserName;
|
||||
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");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||
data3 += "&type_in=26,38";
|
||||
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||
data3 += "&type_in=35,36";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
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()))
|
||||
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||
data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
|
||||
return data3;
|
||||
}
|
||||
|
||||
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();
|
||||
}));
|
||||
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_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24";
|
||||
else if (cmbType.Text == "退货包裹扣费支出")
|
||||
data3 += "&type_in=26";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31";
|
||||
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||
data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
|
||||
data3 += "&page=" + ucSplitPage1.CurrentPage;
|
||||
data3 += "&page_size=" + ucSplitPage1.PageSize;
|
||||
paymentList = null;
|
||||
filters = GetBalanceFilters();
|
||||
page = ucSplitPage1.CurrentPage;
|
||||
pageSize = ucSplitPage1.PageSize;
|
||||
}));
|
||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
html3 = GetHtml.PostUtf8(url3, data3);
|
||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||
int count;
|
||||
decimal seconds;
|
||||
try
|
||||
{
|
||||
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;
|
||||
}
|
||||
paymentList = new List<user_payment_record>();
|
||||
paymentList = JsonHelper.DeserializeJsonToList<user_payment_record>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
|
||||
foreach (var payment in paymentList)
|
||||
{
|
||||
if (!this.Created)
|
||||
return;
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var rowIndex = this.dgvPayment.Rows.Add(
|
||||
@@ -206,12 +230,11 @@ namespace Work._29Tools.Forms.UserForms
|
||||
this.dgvPayment.Rows[rowIndex].Height = 60;
|
||||
}));
|
||||
}
|
||||
int count = BaseRegex.GetIntJson(ref html3, "count");
|
||||
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
||||
int pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
||||
pageCount = Math.Max(pageCount, 1);
|
||||
ucSplitPage1.TotalPage = pageCount;
|
||||
#if DEBUG
|
||||
Invoke(new Action(() => { statusBarUserControl1.lblTaskStatus.Text = BaseRegex.GetDecimalJson(ref html3, "seconds") + "秒"; }));
|
||||
Invoke(new Action(() => { statusBarUserControl1.lblTaskStatus.Text = seconds + "秒"; }));
|
||||
#endif
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
@@ -271,7 +294,20 @@ namespace Work._29Tools.Forms.UserForms
|
||||
|
||||
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())
|
||||
{
|
||||
@@ -281,40 +317,86 @@ namespace Work._29Tools.Forms.UserForms
|
||||
saveFileDialog.RestoreDirectory = true;
|
||||
if (saveFileDialog.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.AppendLine("类型,订单ID,金额,余额,创建时间,备注");
|
||||
|
||||
foreach (var item in paymentList)
|
||||
if (allPages)
|
||||
{
|
||||
//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 = "未知";
|
||||
if (item.type.HasValue)
|
||||
{
|
||||
if (Enum.TryParse<EnumOrderPaymentType>(item.type.Value.ToString(), out EnumOrderPaymentType v))
|
||||
{
|
||||
type = v.ToString();
|
||||
}
|
||||
}
|
||||
statusBarUserControl1.pgbTaskProgress.Maximum = 100;
|
||||
statusBarUserControl1.InitProgressBar();
|
||||
statusBarUserControl1.UpdateProgressBarStatus("正在读取第 1 页…");
|
||||
records = await ReadAllBalancePages(filters, pageSize);
|
||||
statusBarUserControl1.UpdateProgressBarStatus($"正在保存 {records.Count} 条记录…");
|
||||
}
|
||||
|
||||
|
||||
sb.AppendLine($"{type},{item.order_id},{item.amount},{item.balance},{item.create_time.ToString("yyyy-MM-dd HH:mm:ss")},{item.remark}");
|
||||
var fileName = saveFileDialog.FileName;
|
||||
await Task.Run(() => SaveBalanceRecords(fileName, records));
|
||||
if (allPages && !IsDisposed)
|
||||
{
|
||||
statusBarUserControl1.UpdateProgressBar(100);
|
||||
statusBarUserControl1.FinishProgressBar($"导出完成,共 {records.Count} 条记录");
|
||||
}
|
||||
File.WriteAllText(saveFileDialog.FileName, sb.ToString(), Encoding.UTF8);
|
||||
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();
|
||||
sb.AppendLine("类型,订单ID,金额,余额,创建时间,备注");
|
||||
|
||||
foreach (var item in records)
|
||||
{
|
||||
string type = "未知";
|
||||
if (item.type.HasValue)
|
||||
{
|
||||
if (Enum.TryParse<EnumOrderPaymentType>(item.type.Value.ToString(), out EnumOrderPaymentType v))
|
||||
{
|
||||
type = v.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
sb.AppendLine($"{type},{item.order_id},{item.amount},{item.balance},{item.create_time.ToString("yyyy-MM-dd HH:mm:ss")},{item.remark}");
|
||||
}
|
||||
File.WriteAllText(fileName, sb.ToString(), Encoding.UTF8);
|
||||
}
|
||||
|
||||
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()
|
||||
{
|
||||
|
||||
@@ -24,7 +24,9 @@ namespace WxOrder.Framework.Commons
|
||||
public DialogWindow(Window owner = null)
|
||||
{
|
||||
InitializeComponent();
|
||||
Owner = owner ?? Application.Current.MainWindow;
|
||||
Owner = owner ?? Application.Current.Windows
|
||||
.OfType<Window>()
|
||||
.FirstOrDefault(w => w.IsActive) ?? Application.Current.MainWindow;
|
||||
isConstructorSuccessful = true;
|
||||
dialogWindowStyle = (Style)TryFindResource("DialogWindowStyle");
|
||||
Loaded += DialogWindow_Loaded;
|
||||
|
||||
Reference in new issue
Block a user