优化拍单和oem每单费用读取
This commit is contained in:
1 parent
7ccc1aae80
commit
a0b25ae79c
13 files changed
+129
-75
No files matched your search
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
@@ -22,4 +23,17 @@ namespace AllBase.Model.Config
|
||||
/// </summary>
|
||||
public bool IsSyncDirectBuyOrderWaybill { get; set; } = false;
|
||||
}
|
||||
|
||||
public enum TransitOrderBuyStatusEnum
|
||||
{
|
||||
/// <summary> 正常拍单 </summary>
|
||||
[Description("正常分销发货包裹")]
|
||||
Normal = 1,
|
||||
/// <summary> 异常重拍,需有正常单且买手被退款导致异常且未出物流,仓库和溯源码要求与第一次一致 </summary>
|
||||
[Description("异常重拍")]
|
||||
AbnormalReybuy = 2,
|
||||
/// <summary> 额外重拍,需有正常单且买手被退款导致异常且已出物流,仓库和溯源码无一致性要求 </summary>
|
||||
[Description("额外重拍")]
|
||||
AbnormalExtraBuy = 3
|
||||
}
|
||||
}
|
||||
@@ -426,10 +426,12 @@ namespace AllBase.Model.DBModel
|
||||
this.SetValue(x => x.ItemTransitExtraOrder, value);
|
||||
if (ItemTransitExtraOrder != null)
|
||||
{
|
||||
if (ItemTransitExtraOrder.real_logistics_code.IsNullOrEmpty())
|
||||
{
|
||||
if (ItemTransitExtraOrder.pack_type == "3")
|
||||
ItemTransitExtraOrder.real_logistics_code = "额外重拍包裹处理中";
|
||||
else if (ItemTransitExtraOrder.pack_type == "1")
|
||||
ItemTransitExtraOrder.real_logistics_code = "多品订单额外包裹处理中";
|
||||
else
|
||||
ItemTransitExtraOrder.real_logistics_code = "滞留补发处理中";
|
||||
}
|
||||
}
|
||||
TransitExtraPackageWaybillStr = (ItemTransitExtraOrder?.real_logistics_code + "-" + ItemTransitExtraOrder?.real_logistics_express_code).Trim('-');
|
||||
TransitExtraPackageWaybillBtnStr = ItemTransitExtraOrder?.order_void_status == 1 ? "已作废" : "作废";
|
||||
|
||||
@@ -200,8 +200,8 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
||||
transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
|
||||
!(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) &&
|
||||
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
|
||||
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
|
||||
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "3" && af.order_void_status != 1)) ||
|
||||
!OrderItem.ItemTransitExtraOrders.Any(eo => eo.pack_type == "2" && eo.order_code == transitDetail.OrderCode && eo.order_void_status != 1) &&
|
||||
!OrderItem.ItemTransitExtraOrders.Any(eo => eo.pack_type == "3" && eo.order_sku_id == transitDetail.WxOrderSkuId && eo.order_void_status != 1)) ||
|
||||
OrderItem._itemOrderIsAbnormal == true ?
|
||||
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
|
||||
|
||||
@@ -364,38 +364,39 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
||||
TransitTypeStr = "额外包裹",
|
||||
|
||||
OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId,
|
||||
SourceCode = transitOrder?.random_code,
|
||||
SourceCode = transitExtraOrder?.pack_type == "2" ? transitOrder?.random_code : transitExtraOrder?.random_code,
|
||||
|
||||
WxOrderId = transitExtraOrder.order_no,
|
||||
WxOrderSkuId = transitOrder?.order_sku_id,
|
||||
WxOrderSkuId = transitExtraOrder?.pack_type == "2" ? transitOrder?.order_sku_id : transitExtraOrder.order_sku_id,
|
||||
WxOrderThumbImg = OrderItem.thumb_img,
|
||||
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
|
||||
|
||||
TransitAddTimeStr = transitExtraOrder.created_time == null ? "" : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
|
||||
OutOrderId = transitOrder?.out_order_no,
|
||||
OutBuyerName = transitOrder?.OutOrderBuyerStr,
|
||||
OutOrderId = transitExtraOrder?.pack_type == "2" ? transitOrder?.out_order_no : transitExtraOrder?.out_order_no,
|
||||
OutBuyerName = transitExtraOrder?.pack_type == "2" ? transitOrder?.OutOrderBuyerStr : transitExtraOrder?.OutOrderBuyerStr,
|
||||
|
||||
UpperWaybill = (transitExtraOrder.logistics_code + "-" + transitExtraOrder.logistics_express_code).Trim('-'),
|
||||
DownWaybill = (transitExtraOrder.real_logistics_code + "-" + transitExtraOrder.real_logistics_express_code).Trim('-'),
|
||||
BuyRefundStatus = transitOrder.refund_status,
|
||||
BuyRefundStatus = transitExtraOrder?.pack_type == "2" ? transitOrder?.refund_status : transitExtraOrder?.refund_status,
|
||||
|
||||
CreateTime = transitExtraOrder.created_time,
|
||||
PickUpTime = transitExtraOrder.pickup_time,
|
||||
InboundTime = transitExtraOrder.inbound_time,
|
||||
OutboundTime = transitExtraOrder.outbound_time,
|
||||
|
||||
WarehouseId = transitOrder?.platform,
|
||||
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
|
||||
|
||||
WarehouseId = transitExtraOrder?.pack_type == "2" ? transitOrder?.platform : transitExtraOrder?.platform,
|
||||
|
||||
ShelfCodeStr = transitExtraOrder.location_code,
|
||||
ShelfTimeStr = transitExtraOrder.location_write_time == null ? "" : transitExtraOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
};
|
||||
transitDetail.WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitDetail?.WarehouseId) ? TransitWarehouseData.dicWarehouseIdName[transitDetail?.WarehouseId] : transitDetail?.WarehouseId;
|
||||
|
||||
var buyerAccount = transitExtraOrder?.pack_type == "2" ? transitOrder?.buyer_account : transitExtraOrder?.buyer_account;
|
||||
if (!transitDetail.OutOrderId.StartsWith("tb_"))
|
||||
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
|
||||
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyerAccount)?.buyer_id ?? "";
|
||||
else
|
||||
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
|
||||
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyerAccount)?.buyer_id ?? "";
|
||||
|
||||
// 额外包裹处理状态,0 未使用,1 已创建,2 创建失败
|
||||
if (transitExtraOrder.transfer_warehouse_status == 0)
|
||||
@@ -434,7 +435,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
||||
if (transitExtraOrder?.has_reject == 99)
|
||||
transitDetail.TransitRejectStatus = "拒收成功";
|
||||
|
||||
// 额外包裹拦截状态暂时没有,待补充
|
||||
// 额外包裹拦截状态
|
||||
var wayBillId = transitExtraOrder.logistics_express_code ?? transitExtraOrder.real_logistics_express_code;
|
||||
var transitAfterSaleOrder = /* 取未作废的退货包裹,如果取不到,就取第一个退货包裹 */
|
||||
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitExtraOrder.order_code && a.refund_waybill == wayBillId && a.order_void_status != 1 && a.pack_type == 2) ??
|
||||
|
||||
@@ -9,6 +9,12 @@ namespace AllBase.Model.DBModel;
|
||||
|
||||
public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
{
|
||||
public string OutOrderBuyerStr
|
||||
{
|
||||
get { return this.GetValue(x => x.OutOrderBuyerStr); }
|
||||
set { this.SetValue(x => x.OutOrderBuyerStr, value); }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 主键ID
|
||||
/// </summary>
|
||||
@@ -24,7 +30,14 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
/// <summary>
|
||||
/// 买家账号
|
||||
/// </summary>
|
||||
public string buyer_account { get; set; }
|
||||
public string buyer_account
|
||||
{
|
||||
get { return this.GetValue(x => x.OutOrderBuyerStr); }
|
||||
set
|
||||
{
|
||||
this.SetValue(x => x.OutOrderBuyerStr, value);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 外部金额(分)
|
||||
/// </summary>
|
||||
@@ -78,7 +91,7 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
public int? retry_acquire_success { get; set; } // '重试取号是否成功 0=未尝试/未重试 1=成功 2=失败',
|
||||
public int? over_weight_fee { get; set; } // '超重费用',
|
||||
/// <summary>
|
||||
/// 中转仓额外包裹类型 1商品2额外3礼品4退货
|
||||
/// 中转仓额外包裹类型 1多件商品额外2滞留补发额外3秒退重拍额外4退货(暂未使用)
|
||||
/// </summary>
|
||||
public string pack_type { get; set; }
|
||||
public DateTime? rejected_time { get; set; } // '拒收时间',
|
||||
@@ -99,7 +112,7 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
|
||||
/// <summary>
|
||||
/// 商品skuId
|
||||
/// </summary>
|
||||
public string out_sku_id { get; set; }
|
||||
public string order_sku_id { get; set; }
|
||||
/// <summary>
|
||||
/// 拦截退回状态:0未处理,1已退回成功,2退回失败(或其它业务码)
|
||||
/// </summary>
|
||||
|
||||
Reference in new issue
Block a user