订单筛选功能优化
This commit is contained in:
1 parent
9ce8c6e6bc
commit
f3ec329e77
7 files changed
+347
-62
No files matched your search
@@ -345,18 +345,38 @@ namespace AllBase.Model.DBModel
|
||||
}
|
||||
|
||||
// 关闭中转包裹退回,改为中转分销退货
|
||||
//if (AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||
// AddEditTransitWarehouseAfterSaleStr = "";
|
||||
//AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
|
||||
//if (DistribReturnOrderInfo?.warehouse_status == 1)
|
||||
// AddEditTransitWarehouseReturnOrderStr = "已创建";
|
||||
//if (DistribReturnOrderInfo?.warehouse_status == 2)
|
||||
// AddEditTransitWarehouseReturnOrderStr = "创建异常";
|
||||
//if (DistribReturnOrderInfo?.warehouse_status == 3)
|
||||
// AddEditTransitWarehouseReturnOrderStr = "处理中";
|
||||
//if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
//{
|
||||
// if (AddEditTransitWarehouseReturnOrderStr == "添加")
|
||||
// AddEditTransitWarehouseReturnOrderStr = "";
|
||||
//}
|
||||
|
||||
if (AddEditTransitWarehouseAfterSaleStr == "添加")
|
||||
AddEditTransitWarehouseAfterSaleStr = "";
|
||||
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
|
||||
AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "未创建" : "已添加";
|
||||
if (DistribReturnOrderInfo?.warehouse_status == 1)
|
||||
AddEditTransitWarehouseReturnOrderStr = "已创建";
|
||||
{
|
||||
if ((DistribReturnOrderInfo?.real_logistics_express_code).IsNullOrEmpty())
|
||||
AddEditTransitWarehouseReturnOrderStr = "已到仓";
|
||||
else
|
||||
AddEditTransitWarehouseReturnOrderStr = "已发回";
|
||||
}
|
||||
if (DistribReturnOrderInfo?.warehouse_status == 2)
|
||||
AddEditTransitWarehouseReturnOrderStr = "创建异常";
|
||||
AddEditTransitWarehouseReturnOrderStr = "创建失败";
|
||||
if (DistribReturnOrderInfo?.warehouse_status == 3)
|
||||
AddEditTransitWarehouseReturnOrderStr = "处理中";
|
||||
AddEditTransitWarehouseReturnOrderStr = "已创建未到仓";
|
||||
if (TransitRefundStatusStr.Contains("退款成功"))
|
||||
{
|
||||
if (AddEditTransitWarehouseReturnOrderStr == "添加")
|
||||
if (AddEditTransitWarehouseReturnOrderStr == "未创建")
|
||||
AddEditTransitWarehouseReturnOrderStr = "";
|
||||
}
|
||||
}
|
||||
@@ -961,7 +981,11 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public Visibility PurchasePriceVisibility
|
||||
{
|
||||
get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||
get
|
||||
{
|
||||
//if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible;
|
||||
return Visibility.Collapsed;
|
||||
}
|
||||
set { }
|
||||
}
|
||||
|
||||
@@ -978,10 +1002,10 @@ namespace AllBase.Model.DBModel
|
||||
/// 运费文本是否可见
|
||||
/// </summary>
|
||||
public Visibility FreightVisibility
|
||||
{
|
||||
get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||
//get { if (ItemOrder.freight > 0) return Visibility.Visible; return Visibility.Collapsed; }
|
||||
set { }
|
||||
{
|
||||
//get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||
get { return Visibility.Collapsed; }
|
||||
set { }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1171,6 +1195,13 @@ namespace AllBase.Model.DBModel
|
||||
}
|
||||
}
|
||||
|
||||
public string RefundStatusStr
|
||||
{
|
||||
get { return this.GetValue(x => x.RefundStatusStr); }
|
||||
set { this.SetValue(x => x.RefundStatusStr, value); }
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 订单商品表数据库id
|
||||
/// </summary>
|
||||
@@ -1312,7 +1343,24 @@ namespace AllBase.Model.DBModel
|
||||
/// <summary>
|
||||
/// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消)
|
||||
/// </summary>
|
||||
public int? refund_status { get; set; }
|
||||
public int? refund_status
|
||||
{
|
||||
get { return this.GetValue(x => x.refund_status); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.refund_status, value);
|
||||
if (value == 1)
|
||||
RefundStatusStr = "无售后/售后关闭";
|
||||
else if (value == 2)
|
||||
RefundStatusStr = "售后处理中";
|
||||
else if (value == 3)
|
||||
RefundStatusStr = "退款中";
|
||||
else if (value == 4)
|
||||
RefundStatusStr = "退款成功";
|
||||
else if (value == 11)
|
||||
RefundStatusStr = "售后完成订单取消";
|
||||
}
|
||||
}
|
||||
|
||||
public void SetOrderItemTextProperty()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user