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-06-27 00:11:07 +08:00
1 parent 1e27c0b1e1
commit adde7e6fca
22 files changed
+6451 -514
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/Local/oms_wei_external_procurement_log.cs
+20
View File
@@ -22,6 +22,26 @@ namespace AllBase.Model.Local
public string buyer_account { get; set; }
public int? out_amount { get; set; }
public string purchaser_note { get; set; }
public string express_1_company { get; set; }
public string express_1_waybill { get; set; }
public string express_2_company { get; set; }
public string express_2_waybill { get; set; }
public string refund_status { get; set; }
public DateTime pickup_time { get; set; }
/// <summary>
/// 中转仓状态：0 未使用，1 已创建，2 创建失败
/// </summary>
public int? transfer_warehouse_status { get; set; }
public string raw_message { get; set; }
public DateTime created_time { get; set; }
public DateTime updated_time { get; set; }
public string platform { get; set; }
public string order_platform_code { get; set; }
public string order_code { get; set; }
/// <summary>
/// 1正常取号 2提前取号
/// </summary>
public int? pre_allocated_order_no { get; set; }
}
}
AllBase/Model/Result/PddBuyerOrderLiteInfo.cs
+161 -20
View File
@@ -1,4 +1,8 @@
using System;
using AllBase.Model.Local;
using AllBase.Model.MvvmBaseClasses;
using NaiBa.Util.Extension;
using NaiBa.Util.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -6,19 +10,13 @@ using System.Threading.Tasks;
namespace AllBase.Model.Result
{
public class PddBuyerOrderLiteInfo
public class PddBuyerOrderLiteInfo : PropertyNotifyObject
{
//平台快递编码 微信快递名称 PDD
//EMS EMS 邮政快递包裹
//EMS EMS 邮政电商标快
//JTSD 极兔速递 极兔速递
//STO 申通快递 申通快递
//YD 韵达速递 韵达快递
//YTO 圆通速递 圆通快递
//ZTO 中通快递 中通快递
//BTWL 百世快运
//HTKY 百世快递
/// <summary>
/// 获取中转仓物流公司编码
/// </summary>
/// <param name="expressCompanyName"></param>
/// <returns></returns>
public static string GetPddToTransitWarehouseExpressCompanyCode(string expressCompanyName)
{
if (expressCompanyName == null || expressCompanyName == "") return "";
@@ -37,14 +35,24 @@ namespace AllBase.Model.Result
if (expressCompanyName.Contains("京东大件物流")) return "JDKD";
if (expressCompanyName.Contains("极兔速递")) return "JTSD";
if (expressCompanyName.Contains("极兔快递")) return "JTSD";
return "";
//SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔
return "OTHER";
//SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔
}
// 微信快递编码
//平台快递编码 微信快递名称 PDD
//EMS EMS 邮政快递包裹
//EMS EMS 邮政电商标快
//JTSD 极兔速递 极兔速递
//STO 申通快递 申通快递
//YD 韵达速递 韵达快递
//YTO 圆通速递 圆通快递
//ZTO 中通快递 中通快递
//BTWL 百世快运
//HTKY 百世快递
public static string GetPddToWxExpressCompanyCode(string expressCompanyName)
{
if (expressCompanyName == null || expressCompanyName == "") return "";
@@ -86,13 +94,137 @@ namespace AllBase.Model.Result
if (expressCompanyName.Contains("其他快递")) return "OTHER";
return "";
}
public string ShopOrderIdStr
{
get { return this.GetValue(x => x.ShopOrderIdStr); }
set { this.SetValue(x => x.ShopOrderIdStr, value); }
}
public string ShopOrderSkuIdStr
{
get { return this.GetValue(x => x.ShopOrderSkuIdStr); }
set { this.SetValue(x => x.ShopOrderSkuIdStr, value); }
}
public string ShopOrderSkuNameStr
{
get { return this.GetValue(x => x.ShopOrderSkuNameStr); }
set { this.SetValue(x => x.ShopOrderSkuNameStr, value); }
}
public string TransitWarehouseIdStr
{
get { return this.GetValue(x => x.TransitWarehouseIdStr); }
set { this.SetValue(x => x.TransitWarehouseIdStr, value); }
}
// 拍单物流
public string Express1CompanyStr
{
get { return this.GetValue(x => x.Express1CompanyStr); }
set { this.SetValue(x => x.Express1CompanyStr, value); }
}
public string Express1WaybillStr
{
get { return this.GetValue(x => x.Express1WaybillStr); }
set { this.SetValue(x => x.Express1WaybillStr, value); }
}
// 中转仓物流
public string Express2CompanyStr
{
get { return this.GetValue(x => x.Express2CompanyStr); }
set { this.SetValue(x => x.Express2CompanyStr, value); }
}
public string Express2WaybillStr
{
get { return this.GetValue(x => x.Express2WaybillStr); }
set { this.SetValue(x => x.Express2WaybillStr, value); }
}
/// <summary>
/// 中转仓状态：0 未使用，1 已创建，2 创建失败 ?3 已提交创建
/// </summary>
public string TransferWareHouseStatus
{
get { return this.GetValue(x => x.TransferWareHouseStatus); }
set { this.SetValue(x => x.TransferWareHouseStatus, value); }
}
/// <summary>
/// 1正常取号 2提前取号
/// </summary>
public string PreAllocatedOrderNoStr
{
get { return this.GetValue(x => x.PreAllocatedOrderNoStr); }
set { this.SetValue(x => x.PreAllocatedOrderNoStr, value); }
}
public string TransitOrderStatus
{
get
{
if ((TransferWareHouseStatus == "1" || TransferWareHouseStatus == "3") &&
//Express1CompanyStr == this.outExpressCompanyCode && !this.outExpressCompanyCode.IsNullOrEmpty() &&
Express1WaybillStr == this.tracking_number && !this.tracking_number.IsNullOrEmpty())
{
return "已取号";
}
if (string.IsNullOrEmpty(Express1CompanyStr) && string.IsNullOrEmpty(Express1WaybillStr) &&
!string.IsNullOrEmpty(Express2CompanyStr) && !string.IsNullOrEmpty(Express2WaybillStr))
{
return "提前取号";
}
if (/*!string.IsNullOrEmpty(Express1CompanyStr) && Express1CompanyStr != this.outExpressCompanyCode && !this.outExpressCompanyCode.IsNullOrEmpty() &&*/
!string.IsNullOrEmpty(Express1WaybillStr) && Express1WaybillStr != this.tracking_number && !this.tracking_number.IsNullOrEmpty())
{
return "提前取号";
}
if ((TransferWareHouseStatus == "1" || TransferWareHouseStatus == "3") && (string.IsNullOrEmpty(Express1CompanyStr) || string.IsNullOrEmpty(Express1WaybillStr)))
{
return "提前取号";
}
if (TransferWareHouseStatus == "0" && !string.IsNullOrEmpty(Express1CompanyStr) && Express1CompanyStr == outExpressCompanyCode &&
!string.IsNullOrEmpty(Express1WaybillStr) && Express1WaybillStr == tracking_number)
{
return "已提交";
}
if (TransferWareHouseStatus == "2" && !string.IsNullOrEmpty(Express1CompanyStr) && Express1CompanyStr == outExpressCompanyCode &&
!string.IsNullOrEmpty(Express1WaybillStr) && Express1WaybillStr == tracking_number)
{
return "取号失败";
}
return "";
}
set { }
}
public string OrderTimeStr
{
get { return BaseClass.StampToDateTime(order_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); }
set { }
}
/// <summary>
/// 商品信息
/// </summary>
public string ProdInfoStr
{
get { return order_Goods == null ? "" : string.Join("\r\n", order_Goods.Select(g => g.goods_name + " x" + g.goods_number)); }
set { }
}
public decimal AmoutValue
{
get { return order_amount.ParseToInt() * 0.01m; }
set { }
}
public string outExpressCompanyMsg { get; set; } // 物流公司名称，可以尝试直接从列表中匹配
/// <summary>
/// 中转仓物流公司编码
/// </summary>
public string outExpressCompanyCode
{
get
{
return GetPddToWxExpressCompanyCode(outExpressCompanyName);
//return GetPddToWxExpressCompanyCode(outExpressCompanyName);
return GetPddToTransitWarehouseExpressCompanyCode(outExpressCompanyName);
}
}
public string outExpressCompanyName
@@ -120,14 +252,20 @@ namespace AllBase.Model.Result
return "物流名称获取失败";
}
}
public string sendStatus { get; set; } = "";
public string sendStatus
{
get { return this.GetValue(x => x.sendStatus); }
set { this.SetValue(x => x.sendStatus, value); }
}
/// <summary>
/// 微信退款单状态
/// </summary>
public string wxRefundStatus { get; set; } = "";
public string buyerId { get; set; } // 买手Id
public string buyerName { get; set; } // 买手名称
/// <summary>
/// 买手订单号
/// </summary>
public string order_sn { get; set; } // "260409-440915730042665",
public string parent_order_sn { get; set; } // "",
public int? order_amount { get; set; } // 2090,
@@ -136,6 +274,9 @@ namespace AllBase.Model.Result
public int? service_amount { get; set; } // 0,
public string display_amount { get; set; } // 2090 实付款
public long? order_time { get; set; } // 1775731637
/// <summary>
/// 物流单号
/// </summary>
public string tracking_number { get; set; } // "JT5474027114111", 物流单号
public string order_link_url { get; set; } // "order.html?order_sn=260408-386657164922665&page_from=1",