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-09-24 10:29:44 +08:00
1 parent 78ef8eedf3
commit ce8fb3f311
21 files changed
+952 -198
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/Model/Config/BuyConfig.cs
+5
View File
@@ -16,5 +16,10 @@ namespace AllBase.Model.Config
/// 自动修改下单地址到仓库
/// </summary>
public bool IsAutoChangeWarehouseAddress { get; set; } = true;
/// <summary>
/// 是否使用同步单
/// </summary>
public bool IsSyncDirectBuyOrderWaybill { get; set; } = false;
}
}
AllBase/Model/DBModel/TransitWarehouseParam.cs
+1 -1
View File
@@ -42,7 +42,7 @@ namespace AllBase.Model.DBModel
public static string TransitWarehouseDataStr = @"
XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司（仓库二楼） ;22 ;292 ;2415 ;山东省 ;临沂市
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市
AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs
+1 -1
View File
@@ -96,7 +96,7 @@ namespace AllBase.Model.DBModel
/// </summary>
public int? over_weight_fee { get; set; }
/// <summary>
/// 0未申请拒收 1已申请拒收 2申请拒收失败 3已拒收成功 5取消拒收
/// 0未申请拒收 1已申请拒收 2申请拒收失败 3申请拒收成功 5取消拒收
/// </summary>
public int has_reject { get; set; }
/// <summary>
AllBase/Model/DBModel/oms_wei_order_info.cs
+26
View File
@@ -365,6 +365,32 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.GiftErrorMsg, value); }
}
public string SyncLogisticsMsg
{
get { return this.GetValue(x => x.SyncLogisticsMsg); }
set { this.SetValue(x => x.SyncLogisticsMsg, value); }
}
public ConcurrentList<yh_sync_logistics> SyncLogisticsList
{
get { return this.GetValue(x => x.SyncLogisticsList); }
set
{
this.SetValue(x => x.SyncLogisticsList, value);
SyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number;
SyncWaybillPickNo = SyncLogisticsList.FirstOrDefault()?.pickup_code;
}
}
public string SyncWaybillId
{
get { return this.GetValue(x => x.SyncWaybillId); }
set { this.SetValue(x => x.SyncWaybillId, value); }
}
public string SyncWaybillPickNo
{
get { return this.GetValue(x => x.SyncWaybillPickNo); }
set { this.SetValue(x => x.SyncWaybillPickNo, value); }
}
/// <summary>
/// 是否被选中
/// </summary>
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+18 -1
View File
@@ -241,6 +241,14 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
}
public Visibility RejectOrReturnPackageBtnVisibility
{
get { return this.GetValue(x => x.RejectOrReturnPackageBtnVisibility); }
set { this.SetValue(x => x.RejectOrReturnPackageBtnVisibility, value); }
}
public void SetTransitOrder()
{
@@ -309,6 +317,9 @@ namespace AllBase.Model.DBModel
}
RejectOrReturnPackageBtnVisibility = ItemTransitOrderWithVoid != null ? Visibility.Visible : Visibility.Collapsed;
// 拦截退回操作信息
InterceptReturnInfoStr = "";
if (this.ItemTransitOrderWithVoid != null)
@@ -320,7 +331,7 @@ namespace AllBase.Model.DBModel
AddEditTransitWarehouseAfterSaleStr = "已添加";
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
AddEditTransitWarehouseAfterSaleStr = "拦截成功";
if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
else if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
AddEditTransitWarehouseAfterSaleStr = "拦截失败";
if (this.ItemTransitOrderWithVoid == null || (this.ItemRefund?.type != "REFUND" && !this.ItemOrder.IsAbnormal) ||
TransitRefundStatusStr.Contains("退款成功") ||
@@ -342,6 +353,12 @@ namespace AllBase.Model.DBModel
TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-');
// 拦截退回操作信息
InterceptReturnInfoStr = "";
if (this.ItemTransitOrderWithVoid != null && AddEditTransitWarehouseAfterSaleStr != "拦截成功")
InterceptReturnInfoStr = this.ItemTransitOrderWithVoid.intercept_return_info;
AddEditTransitWarehouseReturnOrderStr = "";
if (ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true)
{
AllBase/Model/DBModel/user_payment_record.cs
+1
View File
@@ -86,6 +86,7 @@ namespace AllBase.Model.DBModel
礼物单退费 = 34,
额外订单创建 = 35,
额外订单作废 = 36,
同步物流 = 55,
}
/*
AllBase/Model/DBModel/yh_sync_logistics.cs
+21
View File
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AllBase.Model.DBModel
{
public class yh_sync_logistics
{
public long id { get; set; }
public string order_id { get; set; }
public string tracking_number { get; set; }
public string source_tracking_number { get; set; }
public string pickup_code { get; set; }
public int? upload_pickup_status { get; set; }
public DateTime? create_time { get; set; }
public DateTime? upload_pickup_Time { get; set; }
public string remark { get; set; }
}
}
AllBase/Model/Result/PddPickInfo.cs
+46
View File
@@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AllBase.Model.Result
{
public class PddPickInfo
{
public string station_name {get;set;} // ""
public int count { get; set; } // 73
public List<combine_info> combine_list { get; set; }
}
public class combine_info
{
public string address { get; set; } // "兔喜快递超市(浸校塘东良巷店)",
public string company_name { get; set; } // "喵站代收点",
public string station_code { get; set; } // "8004974987501568",
public string contact_phone { get; set; } // "13556614729",
public string contact_phone_type { get; set; } // "OTHER",
public List<combine_track_info> combine_track_list { get; set; }
public string latest_operate_time { get; set; } // "2026-09-23 19:06:03",
public string company_code { get; set; } // "MIGSTATION",
public bool? display_nav_entry { get; set; } // false,
public bool? all_selected { get; set; } // true
}
public class combine_track_info
{
public string order_sn { get; set; } // "260922-106514399573137",
public int? shipping_id { get; set; } // 115,
public string shipping_name { get; set; } // 中通快递,
public string tracking_number { get; set; } // 79143307021657,
public string pic_url { get; set; } // "https:\u002F\u002Fimg.pddpic.com\u002Fmms-goods-image\u002F2026-08-24\u002F8acb431a-2489-4611-ba84-c85b5bb61401.jpeg",
public string pick_code { get; set; } // "取件码 23-2234",
public string jump_url { get; set; } // "\u002Fgoods_express.html?thumb_url=https%3A%2F%2Fimg.pddpic.com%2Fmms-goods-image%2F2026-08-24%2F8acb431a-2489-4611-ba84-c85b5bb61401.jpeg&order_sn=260922-106514399573137",
public string operation_time { get; set; } // "2026-09-23 19:06:03",
public int? order_count { get; set; } // 1,
public object order_list { get; set; } // [ { "order_sn": "260922-106514399573137", "pic_url": "https:\u002F\u002Fimg.pddpic.com\u002Fmms-goods-image\u002F2026-08-24\u002F8acb431a-2489-4611-ba84-c85b5bb61401.jpeg","jump_url": "\u002Fgoods_express.html?thumb_url=https%3A%2F%2Fimg.pddpic.com%2Fmms-goods-image%2F2026-08-24%2F8acb431a-2489-4611-ba84-c85b5bb61401.jpeg&order_sn=260922-106514399573137"}],
public int? source_type { get; set; } // 6,
public bool? selectd { get; set; } // true,
public int? pickup_status { get; set; } // 0
}
}