继续优化订单读取和展示

This commit is contained in:
wule committed 2026-10-17 09:37:11 +08:00
1 parent 1509e0a11d
commit 2f9c98b105
6 files changed
+197 -161

No files matched your search

@@ -1132,8 +1132,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
bool isUpdate = false; bool isUpdate = false;
PddBuyerAfterSaleLiteInfo afterSale = null; PddBuyerAfterSaleLiteInfo afterSale = lstPddBuyerAfterSaleInfoLite.ToList().FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId);
if (!lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId)) if (afterSale == null)
{ {
isUpdate = true; isUpdate = true;
afterSale = af; afterSale = af;
@@ -1141,7 +1141,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
else else
{ {
afterSale = lstPddBuyerAfterSaleInfoLite.FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId);
var afterSaleTmp = JsonHelper.DeserializeJsonToObject<PddBuyerAfterSaleLiteInfo>(JsonHelper.SerializeObject(afterSale)); var afterSaleTmp = JsonHelper.DeserializeJsonToObject<PddBuyerAfterSaleLiteInfo>(JsonHelper.SerializeObject(afterSale));
//afterSaleTmp.sendStatus = ""; // 比较订单变化,如果有变化,才写库或者处理(设置为空强制变化) //afterSaleTmp.sendStatus = ""; // 比较订单变化,如果有变化,才写库或者处理(设置为空强制变化)
afterSaleTmp.AfterSaleStatusOldStr = null; // 设置null,比较订单变化,如果有变化,才写 afterSaleTmp.AfterSaleStatusOldStr = null; // 设置null,比较订单变化,如果有变化,才写
@@ -205,13 +205,13 @@
WaterMark="成交时间" /> WaterMark="成交时间" />
</wpf:TitleContent> </wpf:TitleContent>
<wpf:TitleContent Title="发货时间:" Visibility="{Binding ItemOrder.ship_done_time_visibility}"> <wpf:TitleContent Title="发货时间:" Visibility="{Binding ItemOrder.ShipDoneTimeVisibility}">
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
d:Text="00-01-01 01:01:01" d:Text="00-01-01 01:01:01"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding ItemOrder.ship_done_time_str}" Text="{Binding ItemOrder.ShipDoneTimeStr}"
TextWrapping="Wrap" TextWrapping="Wrap"
WaterMark="发货时间" /> WaterMark="发货时间" />
</wpf:TitleContent> </wpf:TitleContent>
@@ -416,7 +416,7 @@
BorderBrush="{StaticResource PageWarningBrushCC}" BorderBrush="{StaticResource PageWarningBrushCC}"
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding ElementName=txtWaybillException, Path=Text, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding ShopWaybillExceptionStrVisibility}">
<TextBlock <TextBlock
x:Name="txtWaybillException" x:Name="txtWaybillException"
MinWidth="20" MinWidth="20"
@@ -439,14 +439,14 @@
Background="Transparent" Background="Transparent"
Foreground="{Binding ItemRefund.RefundStatusColor}" Foreground="{Binding ItemRefund.RefundStatusColor}"
Text="{Binding RefundStatusStr}" Text="{Binding RefundStatusStr}"
Visibility="{Binding ElementName=txtOrderItemStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding RefundStatusStrVisibility}" />
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
Foreground="{Binding ItemRefund.RefundStatusColor}" Foreground="{Binding ItemRefund.RefundStatusColor}"
Text=":" Text=":"
Visibility="{Binding ElementName=txtOrderItemStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding RefundStatusStrVisibility}" />
<TextBlock <TextBlock
x:Name="txtStatusStr" x:Name="txtStatusStr"
HorizontalAlignment="Center" HorizontalAlignment="Center"
@@ -455,7 +455,7 @@
Background="Transparent" Background="Transparent"
Foreground="{Binding ItemRefund.RefundStatusColor}" Foreground="{Binding ItemRefund.RefundStatusColor}"
Text="{Binding ItemRefund.RefundStatusStr}" Text="{Binding ItemRefund.RefundStatusStr}"
Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding ItemRefund.RefundStatusStrVisibility}" />
</WrapPanel> </WrapPanel>
<!-- 售后原因 --> <!-- 售后原因 -->
<TextBlock <TextBlock
@@ -465,8 +465,8 @@
d:Text="售后原因" d:Text="售后原因"
Background="Transparent" Background="Transparent"
Foreground="#f56c6c" Foreground="#f56c6c"
Text="{Binding ItemRefund.reasonTextStr}" Text="{Binding ItemRefund.ReasonTextStr}"
Visibility="{Binding ElementName=txtRefundReasonTextStr, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding ItemRefund.ReasonTextStrVisibility}" />
<!-- 售后结果 --> <!-- 售后结果 -->
<TextBlock <TextBlock
@@ -477,7 +477,7 @@
Background="Transparent" Background="Transparent"
Foreground="#f56c6c" Foreground="#f56c6c"
Text="{Binding RefundResultStr}" Text="{Binding RefundResultStr}"
Visibility="{Binding ElementName=txtRefundResult, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding RefundResultStrVisibility}" />
<!-- 收货地址 --> <!-- 收货地址 -->
<wpf:TitleContent Title="收货地址:"> <wpf:TitleContent Title="收货地址:">
@@ -1426,7 +1426,7 @@
Click="btnVoidTransitOrder_Click" Click="btnVoidTransitOrder_Click"
Content="作废重拍" Content="作废重拍"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" /> Visibility="{Binding BtnVoidTransitOrderVisibility}" />
</wpf:TitleContent> </wpf:TitleContent>
<wpf:TitleContent> <wpf:TitleContent>
@@ -1440,7 +1440,7 @@
Click="btnAbnormalOrderRebuy_Click" Click="btnAbnormalOrderRebuy_Click"
Content="异常重拍" Content="异常重拍"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" /> Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
</wpf:TitleContent> </wpf:TitleContent>
@@ -355,7 +355,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return; return;
} }
if (!GetIsAbnormalOrderRebuy(orderItem) && GlobalConfig.lstOrder.Any(o => o.orderItems if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.orderItems
.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id))) .Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
{ {
OrderListCtrl.InitOrderItemObservableProp(orderItem); OrderListCtrl.InitOrderItemObservableProp(orderItem);
@@ -795,25 +795,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
})); }));
}); });
// 作废重拍
if (order_item.ItemOrder.status == 20 /*&& order_item.refund_status <= 1*/ && order_item.ItemTransitOrder != null)
{
btnVoidTransitOrder.Visibility = Visibility.Visible;
}
else
{
btnVoidTransitOrder.Visibility = Visibility.Collapsed;
}
// 异常重拍
if (GetIsAbnormalOrderRebuy(order_item))
{
btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
}
else
{
btnAbnormalOrderRebuy.Visibility = Visibility.Collapsed;
}
// 待采购不显示所有采购信息状态(否则会显示作废订单状态) // 待采购不显示所有采购信息状态(否则会显示作废订单状态)
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购")) if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
@@ -831,30 +812,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
} }
} }
/// <summary>
/// 判断中转仓订单是否可以异常重拍
/// </summary>
/// <param name="order_item"></param>
/// <returns></returns>
static bool GetIsAbnormalOrderRebuy(oms_wei_order_item_info order_item)
{
// 不是异常单的不可异常重拍
if (order_item?.ItemOrder?.IsAbnormal != true)
return false;
// 买手未退款的,中转正式取号以后的,不可异常重拍
if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
return false;
// 已正式取号的,不可异常重拍
if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
return false;
// 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
if (rawMsgKeyWords.Any(k => (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
return false;
return true;
}
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e) private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
{ {
var orderItem = this.DataContext as oms_wei_order_item_info; var orderItem = this.DataContext as oms_wei_order_item_info;
+89 -93
View File
@@ -75,16 +75,8 @@ namespace AllBase.Model.DBModel
/// </summary> /// </summary>
public bool IsRefund public bool IsRefund
{ {
get get { return this.GetValue(x => x.IsRefund); }
{ set { this.SetValue(x => x.IsRefund, value); }
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
if (!orderItems.Any(oi => oi.refund_status > 1))
return false;
if (IsEmergency)
return false;
return true;
}
set { }
} }
/// <summary> /// <summary>
@@ -92,56 +84,25 @@ namespace AllBase.Model.DBModel
/// </summary> /// </summary>
public bool IsEmergency public bool IsEmergency
{ {
get get { return this.GetValue(x => x.IsEmergency); }
{ set { this.SetValue(x => x.IsEmergency, value); }
if (this.order_id == "3737858759084367872")
{
}
// 微信订单退货中
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
{
return true;
}
// 微信订单退款中或退款成功,但是买手订单未完成退款
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
{
return true;
}
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
{
return true;
}
return false;
}
set { }
} }
public bool IsEmergencyDistribReturnOrder public bool IsEmergencyDistribReturnOrder
{ {
get get { return this.GetValue(x => x.IsEmergencyDistribReturnOrder); }
{ set { this.SetValue(x => x.IsEmergencyDistribReturnOrder, value); }
return IsEmergency && IsDistribReturnOrder;
}
set { }
} }
public bool IsEmergencyManualReturnOrder public bool IsEmergencyManualReturnOrder
{ {
get get { return this.GetValue(x => x.IsEmergencyManualReturnOrder); }
{ set { this.SetValue(x => x.IsEmergencyManualReturnOrder, value); }
return IsEmergency && !IsDistribReturnOrder;
}
set { }
} }
public bool IsDistribReturnOrder public bool IsDistribReturnOrder
{ {
get get { return this.GetValue(x => x.IsDistribReturnOrder); }
{ set { this.SetValue(x => x.IsDistribReturnOrder, value); }
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
}
set { }
} }
/// <summary> /// <summary>
/// 异常单(买手异常退货)异常需重拍 /// 异常单(买手异常退货)异常需重拍
@@ -219,18 +180,23 @@ namespace AllBase.Model.DBModel
/// <summary> /// <summary>
/// 订单发货完成时间 /// 订单发货完成时间
/// </summary> /// </summary>
public string ship_done_time_str public string ShipDoneTimeStr
{ {
get { return BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); } get { return this.GetValue(x => x.ShipDoneTimeStr); }
set { } set { this.SetValue(x => x.ShipDoneTimeStr, value); }
} }
/// <summary> /// <summary>
/// 订单发货完成时间可见 /// 订单发货完成时间可见
/// </summary> /// </summary>
public Visibility ship_done_time_visibility public Visibility ShipDoneTimeVisibility
{ {
get { return this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed; } get { return this.GetValue(x => x.ShipDoneTimeVisibility); }
set { } set { this.SetValue(x => x.ShipDoneTimeVisibility, value); }
}
void SetShipDoneTimeStr()
{
ShipDoneTimeStr = BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
ShipDoneTimeVisibility = this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed;
} }
/// <summary> /// <summary>
@@ -238,23 +204,25 @@ namespace AllBase.Model.DBModel
/// </summary> /// </summary>
public string DeliveryDeadlineStatusStr public string DeliveryDeadlineStatusStr
{ {
get get { return this.GetValue(x => x.DeliveryDeadlineStatusStr); }
set { this.SetValue(x => x.DeliveryDeadlineStatusStr, value); }
}
void SetDeliveryDeadlineStatusStr()
{ {
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr))) if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
return "退款中"; DeliveryDeadlineStatusStr = "退款中";
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成")) else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
return "退款完成"; DeliveryDeadlineStatusStr = "退款完成";
// 用户取消申请 // 用户取消申请
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) && else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty())) this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr; DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
if (this.status == 20 || this.status == 21) else if (this.status == 20 || this.status == 21)
{ {
return "剩余"; DeliveryDeadlineStatusStr = "剩余";
} }
return "剩余"; else
} DeliveryDeadlineStatusStr = "剩余";
set { }
} }
/// <summary> /// <summary>
@@ -333,24 +301,22 @@ namespace AllBase.Model.DBModel
public string OutExpressNoStr public string OutExpressNoStr
{ {
get get { return this.GetValue(x => x.OutExpressNoStr); }
{ set { this.SetValue(x => x.OutExpressNoStr, value); }
if (order_id == "3738634560083228416")
{
}
if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
return this.out_express_no + " ×";
return this.out_express_no;
}
set { }
} }
public SolidColorBrush OutExpressNoBrush public SolidColorBrush OutExpressNoBrush
{ {
get get { return this.GetValue(x => x.OutExpressNoBrush); }
{ set { this.SetValue(x => x.OutExpressNoBrush, value); }
return OutExpressNoStr.EndsWith(" ×") ? GlobalConfig.RedTextBrush : GlobalConfig.BlackBrush;
} }
void SetOutExpressNo()
{
if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
OutExpressNoStr = this.out_express_no + " ×";
else
OutExpressNoStr = this.out_express_no;
OutExpressNoBrush = OutExpressNoStr.EndsWith(" ×") ? GlobalConfig.RedTextBrush : GlobalConfig.BlackBrush;
} }
public string GiftOrderStatusStr public string GiftOrderStatusStr
@@ -744,11 +710,11 @@ namespace AllBase.Model.DBModel
IsWaitBuy = GetIsWaitBuy(); IsWaitBuy = GetIsWaitBuy();
IsWaitSend = GetIsWaitSend(); IsWaitSend = GetIsWaitSend();
IsWaitReceive = GetIsWaitReceive(); IsWaitReceive = GetIsWaitReceive();
IsRefund = GetIsRefund();
if (order_id == "3739089000222605568") IsEmergency = GetIsEmergency();
{ IsDistribReturnOrder = GetIsDistribReturnOrder();
IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder;
} IsEmergencyManualReturnOrder = IsEmergency && !IsDistribReturnOrder;
IsAbnormal = GetIsAbnormal(); IsAbnormal = GetIsAbnormal();
if (IsWaitBuy/* || IsWaitSend*/) if (IsWaitBuy/* || IsWaitSend*/)
@@ -760,6 +726,10 @@ namespace AllBase.Model.DBModel
IsShowTransitExtraPackagesBtn = false; IsShowTransitExtraPackagesBtn = false;
else else
IsShowTransitExtraPackagesBtn = true; IsShowTransitExtraPackagesBtn = true;
SetDeliveryDeadlineStatusStr();
SetOutExpressNo();
SetShipDoneTimeStr();
} }
public bool GetIsWaitBuy() public bool GetIsWaitBuy()
@@ -817,11 +787,6 @@ namespace AllBase.Model.DBModel
private bool GetIsWaitReceive() private bool GetIsWaitReceive()
{ {
if (order_id == "3738622310043515392")
{
}
if (refundItems?.Any(r => r.IsRefund) == true) if (refundItems?.Any(r => r.IsRefund) == true)
return false; return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (orderItems?.Any(oi => oi.refund_status > 1) == true)
@@ -833,11 +798,6 @@ namespace AllBase.Model.DBModel
public bool GetIsAbnormal() public bool GetIsAbnormal()
{ {
if (order_id == "3739720775494980096")
{
}
// 三退或者两退,为退款完成单 // 三退或者两退,为退款完成单
//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) && //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 == "退款成功"))) // (oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
@@ -870,5 +830,41 @@ namespace AllBase.Model.DBModel
return true; return true;
return false; return false;
} }
public bool GetIsRefund()
{
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
if (!orderItems.Any(oi => oi.refund_status > 1))
return false;
if (GetIsEmergency())
return false;
return true;
}
public bool GetIsEmergency()
{
// 微信订单退货中
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
{
return true;
}
// 微信订单退款中或退款成功,但是买手订单未完成退款
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
{
return true;
}
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
{
return true;
}
return false;
}
public bool GetIsDistribReturnOrder()
{
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
}
} }
} }
@@ -115,8 +115,14 @@ namespace AllBase.Model.DBModel
public string ShopWaybillExceptionStr public string ShopWaybillExceptionStr
{ {
get { return this.GetValue(x => x.ShopWaybillExceptionStr); } get { return this.GetValue(x => x.ShopWaybillExceptionStr); }
set { this.SetValue(x => x.ShopWaybillExceptionStr, value); } set { this.SetValue(x => x.ShopWaybillExceptionStr, value); ShopWaybillExceptionStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
} }
public Visibility ShopWaybillExceptionStrVisibility
{
get { return this.GetValue(x => x.ShopWaybillExceptionStrVisibility); }
set { this.SetValue(x => x.ShopWaybillExceptionStrVisibility, value); }
}
public oms_wei_order_info ItemOrder public oms_wei_order_info ItemOrder
{ {
@@ -166,7 +172,12 @@ namespace AllBase.Model.DBModel
public string RefundResultStr public string RefundResultStr
{ {
get { return this.GetValue(x => x.RefundResultStr); } get { return this.GetValue(x => x.RefundResultStr); }
set { this.SetValue(x => x.RefundResultStr, value); } set { this.SetValue(x => x.RefundResultStr, value); RefundResultStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility RefundResultStrVisibility
{
get { return this.GetValue(x => x.RefundResultStrVisibility); }
set { this.SetValue(x => x.RefundResultStrVisibility, value); }
} }
/// <summary> /// <summary>
/// 微信小店用户退款快递单号 /// 微信小店用户退款快递单号
@@ -1310,7 +1321,23 @@ namespace AllBase.Model.DBModel
public string RefundStatusStr public string RefundStatusStr
{ {
get { return this.GetValue(x => x.RefundStatusStr); } get { return this.GetValue(x => x.RefundStatusStr); }
set { this.SetValue(x => x.RefundStatusStr, value); } set { this.SetValue(x => x.RefundStatusStr, value); RefundStatusStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility RefundStatusStrVisibility
{
get { return this.GetValue(x => x.RefundStatusStrVisibility); }
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); }
} }
@@ -1597,6 +1624,44 @@ namespace AllBase.Model.DBModel
order_item.BuyGoodsBtnBackColor = GlobalConfig.PurpleBrush35; order_item.BuyGoodsBtnBackColor = GlobalConfig.PurpleBrush35;
order_item.BuyGoodsBtnColor = GlobalConfig.PurpleBrush; order_item.BuyGoodsBtnColor = GlobalConfig.PurpleBrush;
} }
// 作废重拍
if (order_item.ItemOrder.status == 20 /*&& order_item.refund_status <= 1*/ && order_item.ItemTransitOrder != null)
BtnVoidTransitOrderVisibility = Visibility.Visible;
else
BtnVoidTransitOrderVisibility = Visibility.Collapsed;
// 异常重拍
if (order_item.GetIsAbnormalOrderRebuy())
BtnAbnormalOrderRebuyVisibility = Visibility.Visible;
else
BtnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
}
/// <summary>
/// 判断中转仓订单是否可以异常重拍
/// </summary>
/// <param name="order_item"></param>
/// <returns></returns>
public bool GetIsAbnormalOrderRebuy()
{
var order_item = this;
// 不是异常单的不可异常重拍
if (order_item?.ItemOrder?.IsAbnormal != true)
return false;
// 买手未退款的,中转正式取号以后的,不可异常重拍
if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
return false;
// 已正式取号的,不可异常重拍
if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
return false;
// 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
if (rawMsgKeyWords.Any(k => (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
return false;
return true;
} }
} }
} }
+26 -7
View File
@@ -1,10 +1,12 @@
using AllBase.Helper; using AllBase.Helper;
using AllBase.Model.MvvmBaseClasses; using AllBase.Model.MvvmBaseClasses;
using NaiBa.Util.Extension;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media; using System.Windows.Media;
namespace AllBase.Model.DBModel namespace AllBase.Model.DBModel
@@ -14,8 +16,14 @@ namespace AllBase.Model.DBModel
public string RefundStatusStr public string RefundStatusStr
{ {
get { return this.GetValue(x => x.status); } get { return this.GetValue(x => x.status); }
set { this.SetValue(x => x.status, value); } set { this.SetValue(x => x.status, value); RefundStatusStrVisibility = RefundStatusStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
} }
public Visibility RefundStatusStrVisibility
{
get { return this.GetValue(x => x.RefundStatusStrVisibility); }
set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
}
public bool IsRefund public bool IsRefund
{ {
get { return this.GetValue(x => x.IsRefund); } get { return this.GetValue(x => x.IsRefund); }
@@ -32,16 +40,19 @@ namespace AllBase.Model.DBModel
/// <summary> /// <summary>
/// 售后原因文字 /// 售后原因文字
/// </summary> /// </summary>
public string reasonTextStr public string ReasonTextStr
{ {
get get { return this.GetValue(x => x.ReasonTextStr); }
set { this.SetValue(x => x.ReasonTextStr, value); ReasonTextStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility ReasonTextStrVisibility
{ {
return string.IsNullOrEmpty(reason_text) ? string.Empty : "售后原因:" + reason_text; get { return this.GetValue(x => x.ReasonTextStrVisibility); }
} set { this.SetValue(x => x.ReasonTextStrVisibility, value); }
set { }
} }
public long id { get; set; } public long id { get; set; }
public long? shop_id { get; set; } public long? shop_id { get; set; }
public string after_sale_order_id { get; set; } public string after_sale_order_id { get; set; }
@@ -183,7 +194,15 @@ namespace AllBase.Model.DBModel
/// <summary> /// <summary>
/// 退款原因解释 /// 退款原因解释
/// </summary> /// </summary>
public string reason_text { get; set; } public string reason_text
{
get { return this.GetValue(x => x.reason_text); }
set
{
this.SetValue(x => x.reason_text, value);
ReasonTextStr = string.IsNullOrEmpty(reason_text) ? string.Empty : "售后原因:" + reason_text;
}
}
/// <summary> /// <summary>
/// 售后类型。REFUND:退款;RETURN:退货退款。 /// 售后类型。REFUND:退款;RETURN:退货退款。
/// </summary> /// </summary>