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

同上一条

Browse Source
This commit is contained in:
wule committed 2026-10-30 17:11:55 +08:00
1 parent 70996d5409
commit da01c9f83f
11 files changed
+310 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/DBModel/oms_wei_external_procurement_after_sale_info.cs
+8 -1
View File
@@ -110,6 +110,13 @@ namespace AllBase.Model.DBModel
/// 货架写入时间
/// </summary>
public DateTime? location_write_time { get; set; }
/// <summary>
/// 1商品退货包裹2额外退货包裹
/// </summary>
public int? pack_type { get; set; }
/// <summary>
/// 作废状态 1作废成功 2作废失败
/// </summary>
public int? order_void_status { get; set; }
}
}
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+3 -1
View File
@@ -398,7 +398,9 @@ namespace AllBase.Model.DBModel
this.ItemTransitExtraOrder = ItemTransitExtraOrders?.FirstOrDefault(t => t.order_void_status != 1) ?? ItemTransitExtraOrders.FirstOrDefault();
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
// 未作废且已发出的商品退货包裹 ?? 未作废的商品退货包裹 ?? 任意商品退货包裹
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault(taf => taf.order_void_status != 1 && !taf.downstream_waybill.IsNullOrEmpty()) ??
ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault(taf => taf.order_void_status != 1) ?? ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
// 优先找非撤销买手退款单
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
AllBase/Model/DBModel/oms_wei_order_item_transit_info.cs
+31 -16
View File
@@ -8,6 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
namespace AllBase.Model.DBModel;
@@ -16,8 +17,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
public oms_wei_order_item_info OrderItem
{
get { return this.GetValue(x => x.OrderItem); }
set
{
set
{
this.SetValue(x => x.OrderItem, value);
GetOrderItemTransitList();
}
@@ -60,8 +61,8 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
{
var transitDetail = new oms_wei_order_item_transit_detail_info()
{
//VoidPackageBtnVisibility = Visibility.Visible,
RejectPackageBtnVisibility = Visibility.Visible,
//VoidPackageBtnVisibility = Visibility.Visible, /* 作废发货包裹 */
RejectPackageBtnVisibility = Visibility.Visible, /* 拒收发货包裹 */
//ReturnPackageBtnVisibility = Visibility.Visible,
//ExtraPackagesBtnVisibility = Visibility.Visible,
@@ -156,7 +157,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
}
catch (Exception ex)
{
}
}
return detailList;
@@ -182,13 +183,14 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
var transitDetail = new oms_wei_order_item_transit_detail_info()
{
VoidPackageBtnVisibility = Visibility.Visible, /* 作废退货包裹 */
oms_wei_order_item_info = OrderItem,
oms_wei_external_procurement_after_sale_info = transitAftersaleOrder,
ShopName = OrderItem.ItemOrder.shop_name,
//TransitTypeStr = "拦截退回",
TransitTypeStr = "退货包裹",
TransitTypeStr = "退货包裹", /* 拦截退回 */
OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
SourceCode = transitOrder?.random_code,
@@ -207,7 +209,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
BuyRefundStatus = transitOrder.refund_status,
// todo 售后暂时缺少取号时间
// todo 退货包裹暂时缺少取号时间
PickUpTime = transitAftersaleOrder.pickup_time == DateTime.MinValue ? null : transitAftersaleOrder.pickup_time,
CreateTimeStr = transitAftersaleOrder.created_time == null ? null : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
InboundTime = transitAftersaleOrder.inbound_time,
@@ -245,9 +247,9 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
else if (transitAftersaleOrder.warehouse_status == 3)
transitDetail.WarehouseStatus = "已拦截到仓";
// 售后暂时没有作废状态
//if (transitAftersaleOrder.order_void_status == 1)
// transitDetail.TransitVoidStatus = "已作废";
// 售后作废状态
if (transitAftersaleOrder.order_void_status == 1)
transitDetail.TransitVoidStatus = "已作废";
//else if (transitOrder.order_void_status == 2)
// transitDetail.TransitVoidStatus = "作废失败";
@@ -259,7 +261,7 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
}
catch (Exception ex)
{
}
}
return detailList;
@@ -386,11 +388,11 @@ public class oms_wei_order_item_transit_info : PropertyNotifyObject
public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
{
public oms_wei_order_item_transit_detail_info()
public oms_wei_order_item_transit_detail_info()
{
VoidPackageBtnVisibility = Visibility.Collapsed;
RejectPackageBtnVisibility = Visibility.Collapsed;
ReturnPackageBtnVisibility = Visibility.Collapsed;
ReturnPackageBtnVisibility = Visibility.Collapsed;
ExtraPackagesBtnVisibility = Visibility.Collapsed;
}
@@ -411,7 +413,20 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
public string TransitTypeStr
{
get { return this.GetValue(x => x.TransitTypeStr); }
set { this.SetValue(x => x.TransitTypeStr, value); }
set
{
this.SetValue(x => x.TransitTypeStr, value);
TransitTypeStrColor = GlobalConfig.PurpleBrush;
if (value == "退货包裹")
TransitTypeStrColor = GlobalConfig.RedBrush;
else if (value == "额外包裹")
TransitTypeStrColor = GlobalConfig.GreenBrush;
}
}
public SolidColorBrush TransitTypeStrColor
{
get { return this.GetValue(x => x.TransitTypeStrColor); }
set { this.SetValue(x => x.TransitTypeStrColor, value); }
}
/// <summary> 仓库订单号 </summary>
@@ -570,7 +585,7 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
public string InboundTimeStr
{
get { return this.GetValue(x => x.InboundTimeStr); }
set { this.SetValue(x => x.InboundTimeStr, value); }
set { this.SetValue(x => x.InboundTimeStr, value); }
}
public DateTime? OutboundTime
{
AllBase/Model/DBModel/user_payment_record.cs
+2
View File
@@ -86,6 +86,8 @@ namespace AllBase.Model.DBModel
礼物单退费 = 34,
额外订单创建 = 35,
额外订单作废 = 36,
额外订单超重支出 = 37,
退货包裹作废返还 = 38,
同步物流 = 55,
}