1显示最新一条物流信息和展示完整物流轨迹 2优化订单48小时或72小时过滤逻辑
This commit is contained in:
1 parent
f3fa093709
commit
db6774dbda
12 files changed
+749
-33
No files matched your search
@@ -938,10 +938,24 @@ namespace AllBase.Model.DBModel
|
||||
DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : "";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订单中所有商品加起来的总售价文本
|
||||
/// </summary>
|
||||
public string RealPriceStr
|
||||
/// <summary> 直发最后一条物流信息 </summary>
|
||||
public oms_wei_ewaybill_path LatestDirectEWaybill
|
||||
{
|
||||
get { return this.GetValue(x => x.LatestDirectEWaybill); }
|
||||
set { this.SetValue(x => x.LatestDirectEWaybill, value); }
|
||||
}
|
||||
|
||||
/// <summary> 中转仓最后一条物流信息 </summary>
|
||||
public oms_wei_ewaybill_path LatestTransitEWaybill
|
||||
{
|
||||
get { return this.GetValue(x => x.LatestTransitEWaybill); }
|
||||
set { this.SetValue(x => x.LatestTransitEWaybill, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订单中所有商品加起来的总售价文本
|
||||
/// </summary>
|
||||
public string RealPriceStr
|
||||
{
|
||||
//get { return "¥" + (order_items.Sum(oi => oi.real_price) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
get { return "¥" + (real_price * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||
@@ -1384,7 +1398,27 @@ namespace AllBase.Model.DBModel
|
||||
// 拍单、代发等信息判断并控制拍单按钮
|
||||
this.UpdateOrderItemBuyButton();
|
||||
this.SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
|
||||
SetEWaybillInfo();
|
||||
}
|
||||
|
||||
/// <summary> 初始化物流明细信息 </summary>
|
||||
public void SetEWaybillInfo()
|
||||
{
|
||||
if(order_id == "3738794693820307200")
|
||||
{
|
||||
|
||||
}
|
||||
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
|
||||
LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
|
||||
else
|
||||
LatestTransitEWaybill = null;
|
||||
|
||||
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no))
|
||||
LatestDirectEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
|
||||
else
|
||||
LatestDirectEWaybill = null;
|
||||
}
|
||||
|
||||
public void UpdateOrderItemBuyButton()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user