继续优化读单
This commit is contained in:
1 parent
3d86e986b0
commit
bbac29ac78
10 files changed
+1845
-1747
No files matched your search
@@ -27,13 +27,23 @@ namespace AllBase.Model.DBModel
|
||||
{
|
||||
get { return this.GetValue(x => x.Shop); }
|
||||
set { this.SetValue(x => x.Shop, value); }
|
||||
}
|
||||
}
|
||||
|
||||
#region 订单采购参数
|
||||
/// <summary>
|
||||
/// 采购关联
|
||||
/// </summary>
|
||||
public WXBuyMapInfo PddBuyMap
|
||||
/// <summary>
|
||||
/// 订单扩展信息
|
||||
/// </summary>
|
||||
public Visibility OrderItemVisibility
|
||||
{
|
||||
get { return this.GetValue(x => x.OrderItemVisibility); }
|
||||
set { this.SetValue(x => x.OrderItemVisibility, value); }
|
||||
}
|
||||
|
||||
|
||||
#region 订单采购参数
|
||||
/// <summary>
|
||||
/// 采购关联
|
||||
/// </summary>
|
||||
public WXBuyMapInfo PddBuyMap
|
||||
{
|
||||
get { return this.GetValue(x => x.PddBuyMap); }
|
||||
set { this.SetValue(x => x.PddBuyMap, value); }
|
||||
@@ -391,10 +401,10 @@ namespace AllBase.Model.DBModel
|
||||
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
|
||||
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
|
||||
// 优先找非撤销买手退款单
|
||||
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText == "退款成功") ??
|
||||
PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && !p.statusText.Contains("申请已撤销"));
|
||||
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
|
||||
PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && !p.statusText.Contains("申请已撤销"));
|
||||
if (PddBuyerAfterSale == null)
|
||||
PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no);
|
||||
PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no);
|
||||
|
||||
// 直接取号和更正取号显示的买手到仓库物流
|
||||
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
|
||||
@@ -1125,7 +1135,13 @@ namespace AllBase.Model.DBModel
|
||||
public string DirectRefundStatusStr
|
||||
{
|
||||
get { return this.GetValue(x => x.DirectRefundStatusStr); }
|
||||
set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
|
||||
set {
|
||||
if (order_id == "3739897762013171200")
|
||||
{
|
||||
|
||||
}
|
||||
this.SetValue(x => x.DirectRefundStatusStr, value);
|
||||
DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(DirectRefundStatusStr) ? Visibility.Collapsed : Visibility.Visible; }
|
||||
}
|
||||
public Visibility DirectRefundStatusStrVisibility
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user