chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

拍单信息优化 异常单逻辑优化，异常单直拍（50%）

Browse Source
This commit is contained in:
wule committed 2026-07-28 21:09:49 +08:00
1 parent e00209cb24
commit ac0430f3f7
26 files changed
+1663 -478
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_order_info.cs
+66 -23
View File
@@ -40,7 +40,6 @@ namespace AllBase.Model.DBModel
{
if (order_id == "3737846414389704448")
{
}
if (status != 20 && status != 21) return false;
if (orderItems.All(oi => oi.ItemTransitOrder != null)) return false;
@@ -92,7 +91,7 @@ namespace AllBase.Model.DBModel
set { }
}
/// <summary>
/// 售后订单（不含售后关闭）
/// 售后订单（不含售后关闭） -- 改为售后完成订单 260726
/// </summary>
public bool IsRefund
{
@@ -112,15 +111,16 @@ namespace AllBase.Model.DBModel
{
get
{
if (this.order_id == "3737682397646176256")
if (this.order_id == "3737832436815518208")
{
}
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3 || oi.ItemTransitOrders.Count > 0 &&
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3 || (oi.ItemTransitOrders.Count > 0 &&
oi.ItemTransitOrders.Any(t => !string.IsNullOrEmpty(t.refund_status) &&
!t.refund_status.Contains("需手动申请售后") &&
!t.refund_status.Contains("退款成功") &&
!t.refund_status.Contains("关闭") &&
!t.refund_status.Contains("撤销"))))
!t.refund_status.Contains("撤销")))))
{
return true;
}
@@ -140,6 +140,9 @@ namespace AllBase.Model.DBModel
}
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
return true;
// 订单无售后或者售后关闭，有未作废的仓库单且仓库单买手信息为退款成功
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
return true;
@@ -177,19 +180,29 @@ namespace AllBase.Model.DBModel
set { }
}
public DateTime? createDateTime = null;
public DateTime RefundDatetime
{
get { return this.GetValue(x => x.RefundDatetime); }
set { this.SetValue(x => x.RefundDatetime, value); }
}
/// <summary>
/// 订单生成时间
/// </summary>
public string create_time_str
public DateTime CreateDateTime
{
get
{
if (createDateTime == null)
createDateTime = BaseClass.StampToDateTime(create_time);
return createDateTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
}
set { }
get { return this.GetValue(x => x.CreateDateTime); }
private set { this.SetValue(x => x.CreateDateTime, value); }
}
/// <summary>
/// 订单更新时间
/// </summary>
public DateTime UpdateDateTime
{
get { return this.GetValue(x => x.UpdateDateTime); }
private set { this.SetValue(x => x.UpdateDateTime, value); }
}
/// <summary>
@@ -300,10 +313,12 @@ namespace AllBase.Model.DBModel
set { }
}
public string address_str
public string AddressStr
{
get { return user_name + " " + tel_number + " " + province_name + " " + city_name + " " + county_name + " " + detail_info; }
set { }
//get { return user_name + " " + tel_number + " " + province_name + " " + city_name + " " + county_name + " " + detail_info; }
//set { }
get { return this.GetValue(x => x.AddressStr); }
set { this.SetValue(x => x.AddressStr, value); }
}
/// <summary>
@@ -329,9 +344,17 @@ namespace AllBase.Model.DBModel
/// 买家身份标识
/// </summary>
public string openid { get; set; }
public int create_time { get; set; }
public int create_time
{
get { return this.GetValue(x => x.create_time); }
set { this.SetValue(x => x.create_time, value); this.CreateDateTime = BaseClass.StampToDateTime(create_time.ParseToInt()); }
}
public int update_time { get; set; }
public int update_time
{
get { return this.GetValue(x => x.update_time); }
set { this.SetValue(x => x.update_time, value); this.UpdateDateTime = BaseClass.StampToDateTime(update_time.ParseToInt()); }
}
public string unionid { get; set; }
/// <summary>
/// 状态10 待付款；20 待发货；21 部分发货；30 待收货；100 完成；200 全部商品售后之后，订单取消；250 未付款用户主动取消或超时未付款订单自动取消；
@@ -392,7 +415,11 @@ namespace AllBase.Model.DBModel
/// <summary>
/// 延迟发货时间(微信小店：商品发货时效，超时此时间未发货即为发货超时)
/// </summary>
public int? delivery_deadline { get; set; }
public int? delivery_deadline
{
get { return this.GetValue(x => x.delivery_deadline); }
set { this.SetValue(x => x.delivery_deadline, value); }
}
/// <summary>
/// 发货时间
/// </summary>
@@ -414,12 +441,28 @@ namespace AllBase.Model.DBModel
/// <summary>
/// 详细地址
/// </summary>
public string detail_info { get; set; }
public string tel_number { get; set; }
public string detail_info
{
get { return this.GetValue(x => x.detail_info); }
set { this.SetValue(x => x.detail_info, value); }
}
public string tel_number
{
get { return this.GetValue(x => x.tel_number); }
set { this.SetValue(x => x.tel_number, value); }
}
/// <summary>
/// 门牌号码
/// </summary>
public string house_number { get; set; }
public string house_number
{
get { return this.GetValue(x => x.house_number); }
set
{
this.SetValue(x => x.house_number, value);
this.AddressStr = user_name + " " + tel_number + " " + province_name + " " + city_name + " " + county_name + " " + detail_info;
}
}
/// <summary>
/// 虚拟发货订单联系方式(deliver_method=1时返回)
/// </summary>
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+297 -123
View File
@@ -76,6 +76,27 @@ namespace AllBase.Model.DBModel
}
#endregion
/// <summary>
/// 订单扩展信息
/// </summary>
public order_item_ext OrderItemExt
{
get { return this.GetValue(x => x.OrderItemExt); }
set
{
this.SetValue(x => x.OrderItemExt, value);
ShopWaybillExceptionStr = value == null ? "" : value.abnormal_text.ParseToString();
}
}
/// <summary>
/// 店铺后台显示的物流异常信息（订单扩展信息）
/// </summary>
public string ShopWaybillExceptionStr
{
get { return this.GetValue(x => x.ShopWaybillExceptionStr); }
set { this.SetValue(x => x.ShopWaybillExceptionStr, value); }
}
public oms_wei_order_info ItemOrder
{
get { return this.GetValue(x => x.ItemOrder); }
@@ -100,8 +121,12 @@ namespace AllBase.Model.DBModel
else
this.RefundResultStr = "商品退款数量：" + ItemRefund.count + "，订单状态：" + ItemOrder.orderStatusStr;
this.ReturnWaybillIdStr = ItemRefund?.return_waybill_id;
this.RefundTimeStr = BaseClass.StampToDateTime((ItemRefund?.create_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss");
this.RefundTimeVisibility = ItemRefund?.create_time > 0 ? Visibility.Visible : Visibility.Collapsed;
this.RefundDatetime = ItemRefund?.create_time == null ? DateTime.MinValue : BaseClass.StampToDateTime((ItemRefund?.create_time).ParseToInt());
if (ItemOrder != null)
ItemOrder.RefundDatetime = this.RefundDatetime;
this.RefundDateTimeStr = RefundDatetime.ToString("yyyy-MM-dd HH:mm:ss");
this.RefundTimeVisibility = RefundDatetime == DateTime.MinValue ? Visibility.Collapsed : Visibility.Visible;
}
/// <summary>
/// 退款状态文本
@@ -122,10 +147,18 @@ namespace AllBase.Model.DBModel
/// <summary>
/// 订单退款时间
/// </summary>
public string RefundTimeStr
public DateTime RefundDatetime
{
get { return this.GetValue(x => x.RefundTimeStr); }
set { this.SetValue(x => x.RefundTimeStr, value); }
get { return this.GetValue(x => x.RefundDatetime); }
set { this.SetValue(x => x.RefundDatetime, value); }
}
/// <summary>
/// 订单退款时间文本
/// </summary>
public string RefundDateTimeStr
{
get { return this.GetValue(x => x.RefundDateTimeStr); }
set { this.SetValue(x => x.RefundDateTimeStr, value); }
}
/// <summary>
/// 订单退款时间可见
@@ -170,12 +203,27 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.PddBuyerOrder); }
set { this.SetValue(x => x.PddBuyerOrder, value); }
}
public List<order_pdd_buyer_after_sale> PddBuyerAfterSales { get; set; } = new List<order_pdd_buyer_after_sale>();
public order_pdd_buyer_after_sale PddBuyerAfterSale
{
get { return this.GetValue(x => x.PddBuyerAfterSale); }
set { this.SetValue(x => x.PddBuyerAfterSale, value); }
}
public string PddBuyerAfterSaleAddressStr
{
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
}
public void SetTransitOrder()
{
this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
// 优先找非撤销买手退款单
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.statusText == "退款成功") ?? PddBuyerAfterSales?.FirstOrDefault(p => p.statusText != "申请已撤销");
if (PddBuyerAfterSale == null)
PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault();
// 直接取号和更正取号显示的买手到仓库物流
if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
@@ -195,11 +243,20 @@ namespace AllBase.Model.DBModel
else
TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
if (order_id == "3737937905497545216")
{
}
// 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
if (this.ItemTransitOrder == null || !this.ItemOrder.IsRefundWithCancel)
AddEditTransitWarehouseAfterSaleStr = "";
else
AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "查看";
if (this.ItemTransitOrderAfterSale != null)
TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-');
this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
}
/// <summary>
/// 仓库退货编辑按钮文本参数
@@ -233,6 +290,11 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
}
public string TransitWarehouseAfterSaleWayBillStr
{
get { return this.GetValue(x => x.TransitWarehouseAfterSaleWayBillStr); }
set { this.SetValue(x => x.TransitWarehouseAfterSaleWayBillStr, value); }
}
#endregion
#region 买手物流参数
@@ -263,7 +325,7 @@ namespace AllBase.Model.DBModel
// 拼多多买手状态为已签收的，为已到中转仓
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
{
BuyerTransitWaybillStatusStr = "已到中转仓";
BuyerTransitWaybillStatusStr = "买手已送达";
}
// 售后待用户退回商品的，至少为买手已发货
else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待用户退回商品"))
@@ -309,15 +371,15 @@ namespace AllBase.Model.DBModel
public void SetBuyerTransitWaybillStatusStrColor()
{
if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(152, 96, 143));
else if(BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(19, 206, 102));
else if(BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(255, 186, 0));
else if(BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(255, 73, 73));
BuyerTransitWaybillStatusStrColor = PurpleBrush;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手已送达"))
BuyerTransitWaybillStatusStrColor = GreenBrush;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
BuyerTransitWaybillStatusStrColor = YellowBrush;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
BuyerTransitWaybillStatusStrColor = RedBrush;
else
BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(255, 73, 73));
BuyerTransitWaybillStatusStrColor = RedBrush;
}
public SolidColorBrush BuyerTransitWaybillStatusBorderColor
{
@@ -327,15 +389,15 @@ namespace AllBase.Model.DBModel
public void SetBuyerTransitWaybillStatusBorderColor()
{
if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
else if(BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(208, 245, 224));
else if(BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(255, 241, 204));
else if(BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(255, 219, 219));
BuyerTransitWaybillStatusBorderColor = PurpleBrush75;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手已送达"))
BuyerTransitWaybillStatusBorderColor = GreenBrush75;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
BuyerTransitWaybillStatusBorderColor = YellowBrush75;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
BuyerTransitWaybillStatusBorderColor = RedBrush75;
else
BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(255, 219, 219));
BuyerTransitWaybillStatusBorderColor = RedBrush75;
}
public SolidColorBrush BuyerTransitWaybillStatusBackColor
{
@@ -345,94 +407,95 @@ namespace AllBase.Model.DBModel
public void SetBuyerTransitWaybillStatusBackColor()
{
if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
else if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(231, 250, 240));
BuyerTransitWaybillStatusBackColor = PurpleBrush35;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手已送达"))
BuyerTransitWaybillStatusBackColor = GreenBrush35;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(255, 248, 230));
BuyerTransitWaybillStatusBackColor = YellowBrush35;
else if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(255, 237, 237));
BuyerTransitWaybillStatusBackColor = RedBrush35;
else
BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(255, 237, 237));
BuyerTransitWaybillStatusBackColor = RedBrush35;
}
#endregion
#region 仓库物流参数
public string WarehouseWaybillStatusStr
{
get
get { return this.GetValue(x => x.WarehouseWaybillStatusStr); }
set { this.SetValue(x => x.WarehouseWaybillStatusStr, value); }
}
public void SetWarehouseWaybillStatusStr()
{
WarehouseWaybillStatusStr = "";
if (ItemTransitOrderWithVoid == null)
WarehouseWaybillStatusStr = "";
// 订单不满足鸿浩仓库发货条件，无法调用鸿浩仓库接口发货
else if ((ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常") ||
ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("无法调用")) &&
ItemTransitOrderWithVoid.transfer_warehouse_status != 1)
{
if (ItemTransitOrderWithVoid == null)
return "";
// 订单不满足鸿浩仓库发货条件，无法调用鸿浩仓库接口发货
if ((ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常") ||
ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("无法调用")) &&
ItemTransitOrderWithVoid.transfer_warehouse_status != 1)
{
if (ItemTransitOrderWithVoid.raw_message.Contains("超出派送范围"))
return "取号异常-超出派送范围";
else
return "取号异常";
}
if (ItemTransitOrderWithVoid?.warehouse_status == 2)
return "中转已出库";
// 老订单还用之前的逻辑判断
if (ItemTransitOrderWithVoid?.created_time < new DateTime(2026, 7, 14) && (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
//return "中转已出库*";
return "中转已出库";
if (ItemTransitOrderWithVoid?.warehouse_status == 1)
return "中转已入库";
//if ((ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
// return "中转已发货";
//if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
// return "中转待发货";
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return "中转已取号";
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 2)
return "中转提前取号";
//if (ItemTransitOrderWithVoid?.order_void_status == 2)
// return "中转作废失败";
//if (ItemTransitOrderWithVoid?.order_void_status == 1)
// return "中转已作废";
if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 0)
return "中转待取号";
return "";
if (ItemTransitOrderWithVoid.raw_message.Contains("超出派送范围"))
WarehouseWaybillStatusStr = "取号异常-超出派送范围";
else
WarehouseWaybillStatusStr = "取号异常";
}
set { }
else if (ItemTransitOrderWithVoid?.warehouse_status == 2)
WarehouseWaybillStatusStr = "中转已出库";
// 老订单还用之前的逻辑判断
else if (ItemTransitOrderWithVoid?.created_time < new DateTime(2026, 7, 14) && (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
//WarehouseWaybillStatusStr = "中转已出库*";
WarehouseWaybillStatusStr = "中转已出库";
else if (ItemTransitOrderWithVoid?.warehouse_status == 1)
WarehouseWaybillStatusStr = "中转已入库";
//else if ((ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3) && !ItemTransitOrderWithVoid.express_2_company.IsNullOrEmpty() && !ItemTransitOrderWithVoid.express_2_waybill.IsNullOrEmpty())
// WarehouseWaybillStatusStr = "中转已发货";
//else if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
// WarehouseWaybillStatusStr = "中转待发货";
else if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
WarehouseWaybillStatusStr = "中转已取号";
else if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 2)
WarehouseWaybillStatusStr = "中转提前取号";
//else if (ItemTransitOrderWithVoid?.order_void_status == 2)
// WarehouseWaybillStatusStr = "中转作废失败";
//else if (ItemTransitOrderWithVoid?.order_void_status == 1)
// WarehouseWaybillStatusStr = "中转已作废";
else if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 0)
WarehouseWaybillStatusStr = "中转待取号";
}
public SolidColorBrush WarehouseWaybillStatusStrColor
{
get
{
//if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
// return new SolidColorBrush(Color.FromRgb(152, 96, 143));
// return PurpleBrush;
if (WarehouseWaybillStatusStr.StartsWith("中转已出库"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102));
return GreenBrush;
if (WarehouseWaybillStatusStr.StartsWith("中转已入库") || WarehouseWaybillStatusStr.StartsWith("中转已取号") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 186, 0));
return YellowBrush;
if (WarehouseWaybillStatusStr.StartsWith("中转待取号"))
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return RedBrush;
return RedBrush;
}
set { }
}
public void SetWarehouseWaybillStatusStrColor()
{
}
public SolidColorBrush WarehouseWaybillStatusBorderColor
{
get
{
//if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
// return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
// return PurpleBrush75;
if (WarehouseWaybillStatusStr.StartsWith("中转已出库"))
return new SolidColorBrush(Color.FromRgb(208, 245, 224));
return GreenBrush75;
if (WarehouseWaybillStatusStr.StartsWith("中转已入库") || WarehouseWaybillStatusStr.StartsWith("中转已取号") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 241, 204));
return YellowBrush75;
if (WarehouseWaybillStatusStr.StartsWith("中转待取号"))
return new SolidColorBrush(Color.FromRgb(255, 219, 219));
return new SolidColorBrush(Color.FromRgb(255, 219, 219));
return RedBrush75;
return RedBrush75;
}
set { }
}
@@ -441,20 +504,19 @@ namespace AllBase.Model.DBModel
get
{
//if (WarehouseWaybillStatusStr.StartsWith("中转已作废"))
// return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
// return PurpleBrush35
if (WarehouseWaybillStatusStr.StartsWith("中转已出库"))
return new SolidColorBrush(Color.FromRgb(231, 250, 240));
return GreenBrush35;
if (WarehouseWaybillStatusStr.StartsWith("中转已入库") || WarehouseWaybillStatusStr.StartsWith("中转已取号") || WarehouseWaybillStatusStr.StartsWith("中转提前取号"))
return new SolidColorBrush(Color.FromRgb(255, 248, 230));
return YellowBrush35;
if (WarehouseWaybillStatusStr.StartsWith("中转待取号"))
return new SolidColorBrush(Color.FromRgb(255, 237, 237));
return new SolidColorBrush(Color.FromRgb(255, 237, 237));
return RedBrush35;
return RedBrush35;
}
set { }
}
#endregion
/// <summary>
/// 中转仓表买手售后字段文字显示
/// </summary>
@@ -462,7 +524,7 @@ namespace AllBase.Model.DBModel
{
get
{
if (order_id == "3737688046871408640")
if (order_id == "3737761985909113600")
{
}
@@ -470,10 +532,26 @@ namespace AllBase.Model.DBModel
if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status))
{
// 店铺售后又取消的，如果是买手还没申请售后，不显示需手动申请售后文字
//if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
// return "";
if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
return "";
// 显示售后金额（如果有）
if (ItemTransitOrderWithVoid.refund_status.EndsWith("买手退款成功"))
{
if (PddBuyerAfterSale?.refundAmount != null)
return ItemTransitOrderWithVoid.refund_status + "(¥" + PddBuyerAfterSale.refundAmount * 0.01m + ")";
else
return ItemTransitOrderWithVoid.refund_status + "(退款金额待获取)";
}
if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后"))
return "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到，", "");
if (order_id == "3737761985909113600")
{
}
return ItemTransitOrderWithVoid.refund_status;
}
return "";
@@ -488,13 +566,15 @@ namespace AllBase.Model.DBModel
get
{
if (TransitRefundStatusStr.Contains("退款成功"))
return new SolidColorBrush(Color.FromRgb(19, 206, 102));
return GreenBrush;
if (TransitRefundStatusStr.Contains("需手动申请售后"))
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
//return new SolidColorBrush(Color.FromRgb(255, 186, 0));
return new SolidColorBrush(Color.FromRgb(255, 155, 0));
return RedBrush;
return LightOrangeBrush;
//return YellowBrush;
}
set
{
}
set { }
}
/// <summary>
/// 中转仓作废参数
@@ -519,11 +599,8 @@ namespace AllBase.Model.DBModel
if (ItemTransitOrderWithVoid == null)
return "";
if (ItemOrder.createDateTime == null)
ItemOrder.createDateTime = BaseClass.StampToDateTime(ItemOrder.create_time);
string timeStr = "采购时间：" + ItemTransitOrderWithVoid.created_time.ToString("yyyy-MM-dd HH:mm:ss");
if (ItemOrder.createDateTime.Value.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
if (CreateDateTime.Date != ItemTransitOrderWithVoid.created_time.Date && ItemTransitOrderWithVoid.created_time > ItemTransitOrderWithVoid.created_time.Date.AddHours(1.5))
return timeStr + " ×";
return timeStr + " √";
}
@@ -536,7 +613,7 @@ namespace AllBase.Model.DBModel
{
get
{
return OutOrderTimeQualifiedStr.EndsWith("√") ? new SolidColorBrush(Color.FromRgb(103, 194, 58)) : new SolidColorBrush(Color.FromRgb(250, 71, 51));
return OutOrderTimeQualifiedStr.EndsWith("√") ? GreenTextBrush : RedTextBrush;
}
}
@@ -573,12 +650,12 @@ namespace AllBase.Model.DBModel
get
{
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(255, 73, 73));
return RedBrush;
if ("订单完成".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(19, 206, 102));
return GreenBrush;
if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(255, 186, 0));
return new SolidColorBrush(Color.FromRgb(255, 186, 0));
return YellowBrush;
return YellowBrush;
}
set { }
}
@@ -587,12 +664,12 @@ namespace AllBase.Model.DBModel
get
{
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(255, 219, 219));
return RedBrush75;
if ("订单完成".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(208, 245, 224));
return GreenBrush75;
if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(255, 241, 204));
return new SolidColorBrush(Color.FromRgb(255, 241, 204));
return YellowBrush75;
return YellowBrush75;
}
set { }
}
@@ -601,12 +678,12 @@ namespace AllBase.Model.DBModel
get
{
if ("未知状态,未付款已取消,售后完成订单取消".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(255, 237, 237));
return RedBrush35;
if ("订单完成".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(231, 250, 240));
return GreenBrush35;
if ("待买家收货,店铺部分发货,待店铺发货,待付款".Contains(OrderItemStatusStr))
return new SolidColorBrush(Color.FromRgb(255, 248, 230));
return new SolidColorBrush(Color.FromRgb(255, 248, 230));
return YellowBrush35;
return YellowBrush35;
}
set { }
}
@@ -704,6 +781,7 @@ namespace AllBase.Model.DBModel
set { }
}
decimal profitCount = decimal.MinValue;
/// <summary>
/// 通过计算的利润
@@ -726,6 +804,7 @@ namespace AllBase.Model.DBModel
profitCount = decimal.MinValue;
}
}
/// <summary>
/// 通过计算的利润文本
/// </summary>
@@ -746,12 +825,37 @@ namespace AllBase.Model.DBModel
get
{
if (refund_status == 2 || refund_status == 3 || refund_status == 4 || refund_status == 11)
return new SolidColorBrush(Color.FromRgb(127, 127, 127));
return ProfitCount > 0 ? new SolidColorBrush(Color.FromRgb(103, 194, 58)) : new SolidColorBrush(Color.FromRgb(250, 71, 51));
return GrayBrush;
//return ProfitCount > 0 ? new SolidColorBrush(Color.FromRgb(103, 194, 58)) : new SolidColorBrush(Color.FromRgb(250, 71, 51));
return ProfitCount > 0 ? GreenTextBrush : RedTextBrush;
}
set { }
}
public DateTime CreateDateTime
{
get { return this.GetValue(x => x.CreateDateTime); }
set { this.SetValue(x => x.CreateDateTime, value); }
}
/// <summary>
/// 订单创建时间文本
/// </summary>
public string CreateDateTimeStr
{
get { return this.GetValue(x => x.CreateDateTimeStr); }
set { this.SetValue(x => x.CreateDateTimeStr, value); }
}
/// <summary>
/// 订单更新时间文本
/// </summary>
public string UpdateTimeStr
{
get { return this.GetValue(x => x.UpdateTimeStr); }
set { this.SetValue(x => x.UpdateTimeStr, value); }
}
/// <summary>
/// sku规格名称文本
/// </summary>
@@ -913,11 +1017,81 @@ namespace AllBase.Model.DBModel
/// </summary>
public int? refund_status { get; set; }
public static SolidColorBrush PurpleBrush;
public static SolidColorBrush PurpleBrush75;
public static SolidColorBrush PurpleBrush50;
public static SolidColorBrush PurpleBrush35;
public static SolidColorBrush GreenBrush;
public static SolidColorBrush GreenBrush75;
public static SolidColorBrush GreenBrush35;
public static SolidColorBrush YellowBrush;
public static SolidColorBrush YellowBrush75;
public static SolidColorBrush YellowBrush35;
public static SolidColorBrush LightOrangeBrush;
public static SolidColorBrush OrangeBrush;
public static SolidColorBrush OrangeBrush50;
public static SolidColorBrush RedBrush;
public static SolidColorBrush RedBrush75;
public static SolidColorBrush RedBrush35;
public static SolidColorBrush GrayBrush;
public static SolidColorBrush GreenTextBrush;
public static SolidColorBrush RedTextBrush;
public static SolidColorBrush RedTextBrush50;
public void SetOrderItemTextProperty()
{
CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt());
CreateDateTimeStr = CreateDateTime.ToString("yyyy-MM-dd HH:mm:ss");
UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss");
if (PurpleBrush == null && this.Dispatcher != null)
{
Dispatcher.Invoke(new Action(() =>
{
PurpleBrush = new SolidColorBrush(Color.FromArgb(255, 152, 99, 143));
PurpleBrush75 = new SolidColorBrush(Color.FromArgb(75, 152, 99, 143));
PurpleBrush50 = new SolidColorBrush(Color.FromArgb(50, 152, 99, 143));
PurpleBrush35 = new SolidColorBrush(Color.FromArgb(35, 152, 99, 143));
GreenBrush = new SolidColorBrush(Color.FromArgb(255, 19, 206, 102));
GreenBrush75 = new SolidColorBrush(Color.FromArgb(75, 19, 206, 102));
GreenBrush35 = new SolidColorBrush(Color.FromArgb(35, 19, 206, 102));
YellowBrush = new SolidColorBrush(Color.FromArgb(255, 255, 186, 0));
YellowBrush75 = new SolidColorBrush(Color.FromArgb(75, 255, 186, 0));
YellowBrush35 = new SolidColorBrush(Color.FromArgb(35, 255, 186, 0));
LightOrangeBrush = new SolidColorBrush(Color.FromArgb(255, 255, 155, 0));
OrangeBrush = new SolidColorBrush(Color.FromArgb(255, 250, 127, 51));
OrangeBrush50 = new SolidColorBrush(Color.FromArgb(50, 250, 127, 51));
RedBrush = new SolidColorBrush(Color.FromArgb(255, 255, 73, 73));
RedBrush75 = new SolidColorBrush(Color.FromArgb(75, 255, 73, 73));
RedBrush35 = new SolidColorBrush(Color.FromArgb(35, 255, 73, 73));
GrayBrush = new SolidColorBrush(Color.FromArgb(255, 127, 127, 127));
GreenTextBrush = new SolidColorBrush(Color.FromArgb(255, 103, 194, 58));
RedTextBrush = new SolidColorBrush(Color.FromArgb(255, 250, 71, 51));
RedTextBrush50 = new SolidColorBrush(Color.FromArgb(50, 250, 71, 51));
}));
}
this.SetTransitOrder();
this.SetItemRefund();
this.SetBuyerTransitWaybillStatusStr();
this.SetWarehouseWaybillStatusStr();
// 拍单、代发等信息判断并控制拍单按钮
this.UpdateOrderItemBuyButton();
}
public void UpdateOrderItemBuyButton()
@@ -927,39 +1101,39 @@ namespace AllBase.Model.DBModel
if (GlobalConfig.lstDangerItemWord.Any(d => order_item.title.Contains(d)))
{
order_item.IsBuyGoodsBtnEnabled = false;
order_item.BuyGoodsBtnBackColor = new SolidColorBrush(Color.FromArgb(50, 250, 70, 51));
order_item.BuyGoodsBtnColor = new SolidColorBrush(Color.FromArgb(255, 250, 70, 51));
order_item.BuyGoodsBtnBackColor = RedTextBrush50;
order_item.BuyGoodsBtnColor = RedTextBrush;
order_item.BuyGoodsBtnTxt = "危险品不支持中转拍单";
}
else if (Shop == null || (Shop?.LoginStatus != "登录成功" /*&& Shop?.Is29Supplier == null*/))
{
order_item.IsBuyGoodsBtnEnabled = false;
//order_item.IsBuyGoodsBtnEnabled = true;
order_item.BuyGoodsBtnBackColor = new SolidColorBrush(Color.FromArgb(50, 250, 70, 51));
order_item.BuyGoodsBtnColor = new SolidColorBrush(Color.FromArgb(255, 250, 70, 51));
order_item.BuyGoodsBtnBackColor = RedTextBrush50;
order_item.BuyGoodsBtnColor = RedTextBrush;
order_item.BuyGoodsBtnTxt = "请登录店铺";
}
else if (Shop?.LoginStatus == "登录成功" && Shop?.Is29Supplier == null)
{
order_item.IsBuyGoodsBtnEnabled = false;
order_item.BuyGoodsBtnBackColor = new SolidColorBrush(Color.FromArgb(50, 250, 127, 51));
order_item.BuyGoodsBtnColor = new SolidColorBrush(Color.FromArgb(255, 250, 127, 51));
order_item.BuyGoodsBtnBackColor = OrangeBrush50;
order_item.BuyGoodsBtnColor = OrangeBrush;
order_item.BuyGoodsBtnTxt = "代发状态读取中请稍候";
}
else if (Shop?.Is29Supplier == false)
{
//order_item.IsBuyGoodsBtnEnabled = false;
order_item.IsBuyGoodsBtnEnabled = true;
order_item.BuyGoodsBtnBackColor = new SolidColorBrush(Color.FromArgb(50, 250, 70, 51));
order_item.BuyGoodsBtnColor = new SolidColorBrush(Color.FromArgb(255, 250, 70, 51));
order_item.BuyGoodsBtnBackColor = RedTextBrush50;
order_item.BuyGoodsBtnColor = RedTextBrush;
order_item.BuyGoodsBtnTxt = "去店铺后台绑定代发";
}
else
{
order_item.IsBuyGoodsBtnEnabled = true;
order_item.BuyGoodsBtnTxt = order_item.BuyMap == null ? "关联拍单" : "拍单";
order_item.BuyGoodsBtnBackColor = new SolidColorBrush(Color.FromArgb(50, 152, 99, 143));
order_item.BuyGoodsBtnColor = new SolidColorBrush(Color.FromArgb(255, 152, 99, 143));
order_item.BuyGoodsBtnBackColor = PurpleBrush50;
order_item.BuyGoodsBtnColor = PurpleBrush;
}
}
}
AllBase/Model/DBModel/order_item_ext.cs
+27
View File
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AllBase.Model.DBModel
{
public class order_item_ext
{
public long? id { get; set; }
public string order_id { get; set; }
public string sku_id { get; set; }
public string shop_app_id { get; set; }
public string shop_name { get; set; }
/// <summary>
/// 订单异常文本
/// </summary>
public string abnormal_text { get; set; }
public int? flag { get; set; }
public string label { get; set; }
public string remark { get; set; }
public string after_sale_user_delivery_address { get; set; }
public DateTime add_time { get; set; }
public DateTime mdy_time { get; set; }
}
}
AllBase/Model/DBModel/order_pdd_buyer_after_sale.cs
+30
View File
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AllBase.Model.DBModel
{
public class order_pdd_buyer_after_sale
{
public long? id { get; set; }
public string wx_order_id { get; set; }
public string wx_sku_id { get; set; }
public DateTime TransitCreateTime { get; set; }
//public DateTime TransitPickupTime { get; set; }
public int? pre_allocated_order_no { get; set; }
public string buyerId { get; set; }
public string buyerName { get; set; }
public string afterSalesId { get; set; }
public string orderSn { get; set; }
public int? orderAmount { get; set; }
public long? refundAmount { get; set; }
public long? orderDate { get; set; }
public string statusText { get; set; }
public string afterSaleAddress { get; set; }
public string order_detail { get; set; }
public DateTime add_time { get; set; }
public DateTime mdy_time { get; set; }
}
}
AllBase/Model/DBModel/order_pdd_buyer_order.cs
+1 -1
View File
@@ -12,7 +12,7 @@ namespace AllBase.Model.DBModel
public string wx_order_id { get; set; }
public string wx_sku_id { get; set; }
public DateTime TransitCreateTime { get; set; }
public DateTime TransitPickupTime { get; set; }
//public DateTime TransitPickupTime { get; set; }
public int? pre_allocated_order_no { get; set; }
public string buyerId { get; set; }
public string buyerName { get; set; }