修复部分拍单问题 优化拍单显示
This commit is contained in:
1 parent
87c1b8fc79
commit
5571d227c8
13 files changed
+273
-108
No files matched your search
@@ -31,7 +31,6 @@ namespace AllBase.Model.Local
|
||||
|
||||
public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
|
||||
|
||||
private bool isWaitBuy;
|
||||
/// <summary>
|
||||
/// 待采购
|
||||
/// </summary>
|
||||
@@ -47,6 +46,7 @@ namespace AllBase.Model.Local
|
||||
if (purchase_status != 0) return false;
|
||||
if (!out_order_no.IsNullOrEmpty()) return false;
|
||||
if (status != 20 && status != 21) return false;
|
||||
if (gift_order_status == 1 || gift_order_status == 2) return false;
|
||||
return true;
|
||||
}
|
||||
set { }
|
||||
@@ -70,7 +70,7 @@ namespace AllBase.Model.Local
|
||||
/// </summary>
|
||||
public bool IsWaitReceive
|
||||
{
|
||||
get { return status == 30 || status == 100; }
|
||||
get { return status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2; }
|
||||
set { }
|
||||
}
|
||||
/// <summary>
|
||||
@@ -164,7 +164,7 @@ namespace AllBase.Model.Local
|
||||
{
|
||||
get
|
||||
{
|
||||
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请".Contains(r.statusStr)))
|
||||
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.statusStr)))
|
||||
return "退款中";
|
||||
else if (this.refundItems.Any(r => r.statusStr == "退款完成" || r.statusStr == "退货退款完成"))
|
||||
return "退款完成";
|
||||
|
||||
Reference in new issue
Block a user