chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复显示等相关bug

Browse Source
This commit is contained in:
wule committed 2026-08-26 07:32:23 +08:00
1 parent 3281fe7885
commit 7cc4f5d856
8 files changed
+163 -63
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_order_info.cs
+4 -4
View File
@@ -138,7 +138,7 @@ namespace AllBase.Model.DBModel
set { }
}
/// <summary>
/// 异常单(买手异常退货)
/// 异常单(买手异常退货)异常需重拍
/// </summary>
public bool isAbnormal
{
@@ -680,7 +680,7 @@ namespace AllBase.Model.DBModel
isAbnormal = GetIsAbnormal();
}
private bool GetIsWaitBuy()
public bool GetIsWaitBuy()
{
if (order_id == "3738686976228742912")
{
@@ -744,7 +744,7 @@ namespace AllBase.Model.DBModel
return true;
}
private bool GetIsAbnormal()
public bool GetIsAbnormal()
{
if (order_id == "3738000949931831296")
{
@@ -758,7 +758,7 @@ namespace AllBase.Model.DBModel
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
return true;
// 取号异常或无法调用发货也放在异常单
// 取号异常或无法调用发货也放在异常单（异常需重拍）
// 订单不满足鸿浩仓库发货条件，无法调用鸿浩仓库接口发货
else if (orderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
(oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+10 -5
View File
@@ -850,10 +850,10 @@ namespace AllBase.Model.DBModel
// DirectPddBuyerAfterSale = DirectPddBuyerAfterSales?.FirstOrDefault();
this.DirectPddBuyerAfterSale = DirectPddBuyerAfterSales.FirstOrDefault(p => OrderItemExt?.out_order_id == p.orderSn);
// 服务端这个值不会在拍新单后覆盖，在此处使用扩展订单绑定的买手单信息修改掉，后续在拍单的时候覆盖掉
if (ItemOrder.order_id == "3738114484652896256")
{
if (ItemOrder.order_id == "3738598656037525761")
{
}
}
if (!this.ItemOrder.out_after_sale_status.ParseToString().Contains("需手动申请售后"))
this.ItemOrder.out_after_sale_status = DirectPddBuyerAfterSale?.statusText;
@@ -1093,11 +1093,16 @@ namespace AllBase.Model.DBModel
if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
BtnAbnormalBtnVisibility = Visibility.Collapsed;
if (order_id == "3738706885587395328")
{
}
// 直拍按钮
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
if (this.ItemOrder?.IsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
if (this.ItemOrder?.GetIsWaitBuy() == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible;
if (this.ItemOrder?.isAbnormal == true && this.refund_status <= 1)
if (this.ItemOrder?.GetIsAbnormal() == 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 == "退款成功")