修复买手读单查询微信订单表超时Bug 修复拼多多直发订单售后买手状态显示颜色和内容错误问题
This commit is contained in:
1 parent
785fcce29e
commit
32bccd0ba9
3 files changed
+31
-17
No files matched your search
@@ -492,11 +492,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
List<oms_wei_order_info> GetOrderInfo(string order_ids)
|
List<oms_wei_order_info> GetOrderInfo(string order_ids)
|
||||||
{
|
{
|
||||||
|
if (string.IsNullOrEmpty(order_ids))
|
||||||
|
return new List<oms_wei_order_info>();
|
||||||
|
|
||||||
Thread.Sleep(100);
|
Thread.Sleep(100);
|
||||||
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
|
||||||
var data1 = UserLogin.GetSignaturex();
|
var data1 = UserLogin.GetSignaturex();
|
||||||
data1 += "&erp_order_id_in=" + order_ids;
|
data1 += "&erp_order_id_in=" + order_ids;
|
||||||
data1 += "&page_size=" + 1000;
|
data1 += "&page_size=" + 100;
|
||||||
var html1 = GetHtml.PostUtf8(url1, data1);
|
var html1 = GetHtml.PostUtf8(url1, data1);
|
||||||
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
|
||||||
html1 = GetHtml.PostUtf8(url1, data1);
|
html1 = GetHtml.PostUtf8(url1, data1);
|
||||||
@@ -511,18 +514,20 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
|
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
|
||||||
if (orders == null)
|
if (orders == null)
|
||||||
orders = new List<oms_wei_order_info>();
|
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
|
catch
|
||||||
{
|
{
|
||||||
|
return 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -692,6 +697,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
o.buyerId = buyer.buyer_id;
|
o.buyerId = buyer.buyer_id;
|
||||||
o.buyerName = buyer.buyer_name;
|
o.buyerName = buyer.buyer_name;
|
||||||
|
|
||||||
|
if (o.order_sn == "260730-639463637281501")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// 查找店铺订单并更新店铺订单状态
|
// 查找店铺订单并更新店铺订单状态
|
||||||
var orderItemExt = orderExtList.FirstOrDefault(oie => oie.out_order_id == o.order_sn && oie.buy_type == "直发");
|
var orderItemExt = orderExtList.FirstOrDefault(oie => oie.out_order_id == o.order_sn && oie.buy_type == "直发");
|
||||||
if (orderItemExt != null)
|
if (orderItemExt != null)
|
||||||
@@ -1853,9 +1863,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (order.sendStatus.Contains("外采订单已发货") || order.sendStatus.Contains("微信发货成功") ||
|
if (order.sendStatus.ParseToString().Contains("外采订单已发货") || order.sendStatus.ParseToString().Contains("微信发货成功") ||
|
||||||
order.sendStatus.Contains("已发送待发货订单") || order.sendStatus.Contains("接收成功") ||
|
order.sendStatus.ParseToString().Contains("已发送待发货订单") || order.sendStatus.ParseToString().Contains("接收成功") ||
|
||||||
order.sendStatus.Contains("已发送售后订单"))
|
order.sendStatus.ParseToString().Contains("已发送售后订单"))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1913,9 +1923,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
var sendStatusTmp = string.IsNullOrEmpty(data) ? msg : data;
|
var sendStatusTmp = string.IsNullOrEmpty(data) ? msg : data;
|
||||||
order.sendStatus = sendStatusTmp;
|
order.sendStatus = sendStatusTmp;
|
||||||
|
|
||||||
if (code == "0" && !order.sendStatus.Contains("微信发货成功"))
|
if (code == "0" && !order.sendStatus.ParseToString().Contains("微信发货成功"))
|
||||||
order.sendStatus = ("微信发货成功 " + sendStatusTmp).Trim();
|
order.sendStatus = ("微信发货成功 " + sendStatusTmp).Trim();
|
||||||
if (code == "1" && !order.sendStatus.Contains("接收成功"))
|
if (code == "1" && !order.sendStatus.ParseToString().Contains("接收成功"))
|
||||||
order.sendStatus = ("接收成功 " + sendStatusTmp).Trim();
|
order.sendStatus = ("接收成功 " + sendStatusTmp).Trim();
|
||||||
|
|
||||||
// 处理特殊情况 如未发货或退货订单
|
// 处理特殊情况 如未发货或退货订单
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ namespace AllBase
|
|||||||
public static decimal MinPrice = 0;
|
public static decimal MinPrice = 0;
|
||||||
public static decimal MinBackMoney = 0;
|
public static decimal MinBackMoney = 0;
|
||||||
public static decimal Price = 5;
|
public static decimal Price = 5;
|
||||||
public static int TimeOut = 30;
|
public static int TimeOut = 45;
|
||||||
public static int ThreadCount = 3;
|
public static int ThreadCount = 3;
|
||||||
public static int MainCatId = 0;
|
public static int MainCatId = 0;
|
||||||
public static int GroupId = 0;
|
public static int GroupId = 0;
|
||||||
|
|||||||
@@ -729,14 +729,18 @@ namespace AllBase.Model.DBModel
|
|||||||
// DirectPddBuyerAfterSale = DirectPddBuyerAfterSales?.FirstOrDefault();
|
// DirectPddBuyerAfterSale = DirectPddBuyerAfterSales?.FirstOrDefault();
|
||||||
this.DirectPddBuyerAfterSale = DirectPddBuyerAfterSales.FirstOrDefault(p => OrderItemExt?.out_order_id == p.orderSn);
|
this.DirectPddBuyerAfterSale = DirectPddBuyerAfterSales.FirstOrDefault(p => OrderItemExt?.out_order_id == p.orderSn);
|
||||||
// 服务端这个值不会在拍新单后覆盖,在此处使用扩展订单绑定的买手单信息修改掉,后续在拍单的时候覆盖掉
|
// 服务端这个值不会在拍新单后覆盖,在此处使用扩展订单绑定的买手单信息修改掉,后续在拍单的时候覆盖掉
|
||||||
|
if (ItemOrder.order_id == "3738114484652896256")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
if (!this.ItemOrder.out_after_sale_status.ParseToString().Contains("需手动申请售后"))
|
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;
|
||||||
|
|
||||||
DirectRefundStatusStr = (this.DirectPddBuyerAfterSale?.statusText).ParseToString();
|
DirectRefundStatusStr = this.ItemOrder.out_after_sale_status.ParseToString();
|
||||||
if (DirectRefundStatusStr.Contains("退款成功"))
|
if (DirectRefundStatusStr.Contains("退款成功"))
|
||||||
DirectRefundStatusStr += "(¥" + DirectPddBuyerAfterSale.refundAmount * 0.01m + ")";
|
DirectRefundStatusStr += "(¥" + DirectPddBuyerAfterSale.refundAmount * 0.01m + ")";
|
||||||
|
|
||||||
DirectRefundStatusBackColor = GlobalConfig.RedBrush;
|
DirectRefundStatusBackColor = GlobalConfig.LightOrangeBrush;
|
||||||
if (DirectRefundStatusStr.ParseToString().Contains("退款成功"))
|
if (DirectRefundStatusStr.ParseToString().Contains("退款成功"))
|
||||||
DirectRefundStatusBackColor = GlobalConfig.GreenBrush;
|
DirectRefundStatusBackColor = GlobalConfig.GreenBrush;
|
||||||
else if (DirectRefundStatusStr.ParseToString().Contains("需手动申请售后"))
|
else if (DirectRefundStatusStr.ParseToString().Contains("需手动申请售后"))
|
||||||
|
|||||||
Reference in new issue
Block a user