From 3d091462c52b73830d2b02e4d4cdebee1e808496 Mon Sep 17 00:00:00 2001 From: wule Date: Wed, 11 Nov 2026 18:50:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 1c7983f..0ecebfb 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -37,7 +37,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 388; + public static int VersionCount = 389; //public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string ServerUrl From fe8f9851feffae310f64c8b0b39598330b0ed1ef Mon Sep 17 00:00:00 2001 From: wule Date: Thu, 12 Nov 2026 11:31:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B9=81=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=8B=8D=E5=8D=95=E5=9C=B0=E5=9D=80=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 2 +- AllBase/BaseClass.cs | 1 + .../Model/DBModel/oms_wei_order_item_info.cs | 22 +++++++++++++++++++ Work/UserLogin.cs | 1 + Work/_29Tools/Forms/PddMobileBuyOrderForm.cs | 16 +++++++++++++- 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index e28041e..bab8101 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -60,8 +60,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls public partial class OrderListCtrl : UserControl, INotifyPropertyChanged { private static readonly object locker = new object(); - public static bool IsAutoBuy { get; set; } = false; + public static DateTime LastGetOrderTime { get; set; } = DateTime.Now; public CheckBox chkSelectAll = null; OrderFilterConfig _orderFilterConfig; public OrderFilterConfig orderFilterConfig diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 1c7983f..a6c1b5a 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -604,6 +604,7 @@ namespace AllBase public static string PassWordBak { get; set; } public static string Mobile { get; set; } + public static bool AllowTraditionalBuyAddress { get; set; } public static string ParentAuthority { get; set; } public static string ForbiddenPage { get; set; } public static string UserAuthority { get; set; } diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index 33f62c2..ddd43a1 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -52,6 +52,19 @@ namespace AllBase.Model.DBModel VoidPackageTypeStr = ""; if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed; } + + + //if (value?.oms_wei_external_procurement_log_info is oms_wei_external_procurement_log_info transitInfo) + //{ + // if (this.refund_status == 1 && transitInfo.refund_status.ParseToString().Contains("退款成功") && !TransitPackageLatest.WarehouseStatus.ParseToString().Contains("取号异常(超区)")) + // { + // CanUseTraditionalAddress = true; + // } + // else + // { + // CanUseTraditionalAddress = false; + // } + //} } } @@ -113,6 +126,15 @@ namespace AllBase.Model.DBModel set { this.SetValue(x => x.VoidPackageTypeStr, value); } } + /// + /// 拍单时是否可以使用繁体字地址 + /// + //public bool CanUseTraditionalAddress + //{ + // get { return this.GetValue(x => x.CanUseTraditionalAddress); } + // set { this.SetValue(x => x.CanUseTraditionalAddress, value); } + //} + ///// ///// 订单对应店铺 ///// diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index e2c5f37..82d32a3 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -136,6 +136,7 @@ namespace Work } BaseClass.ParentAuthority = BaseRegex.GetStringJson(ref html, "parent_authority").ParseToString(); + BaseClass.AllowTraditionalBuyAddress = BaseRegex.GetStringJson(ref html, "allow_traditional_buy_address").ParseToInt() == 1; BaseClass.ForbiddenPage = BaseRegex.GetStringJson(ref html, "forbidden_page").ParseToString(); BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile"); BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt(); diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs index 45ffc90..bb2f462 100644 --- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs +++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs @@ -109,7 +109,21 @@ namespace TemuKJD.ToolForms //txtBuyTransitWarehouseRandomStr = value; var numberDic = TransitWarehouseData.dicChineseNumberChar; var txtBuyTransitWarehouseRandomStrTmp = txtBuyTransitWarehouseRandomStr = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室"; - if (BaseClass.Setting.SwitchEnablePddTransitTraditionalAddress == true) + + //if (BaseClass.Setting.SwitchEnablePddTransitTraditionalAddress == true) + var canUseTraditionalAddress = false; + if (orderItem?.TransitPackageLatest?.oms_wei_external_procurement_log_info is oms_wei_external_procurement_log_info transitInfo) + { + if (orderItem.refund_status == 1 && transitInfo.refund_status.ParseToString().Contains("退款成功") && !orderItem.TransitPackageLatest.WarehouseStatus.ParseToString().Contains("取号异常(超区)")) + { + canUseTraditionalAddress = true; + } + else + { + canUseTraditionalAddress = false; + } + } + if (BaseClass.AllowTraditionalBuyAddress && canUseTraditionalAddress == true) { for (int i = 0; i < 10 && txtBuyTransitWarehouseRandomStrTmp == txtBuyTransitWarehouseRandomStr; i++) { From c7cdf3ff8807f179e3effcd8212e41636cf69dc3 Mon Sep 17 00:00:00 2001 From: wule Date: Thu, 12 Nov 2026 11:33:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 605fab1..558e50f 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -37,7 +37,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 389; + public static int VersionCount = 390; //public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string ServerUrl