修改繁体字拍单地址可用逻辑
This commit is contained in:
1 parent
71614f64e4
commit
fe8f9851fe
5 files changed
+40
-2
No files matched your search
@@ -60,8 +60,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
public partial class OrderListCtrl : UserControl, INotifyPropertyChanged
|
public partial class OrderListCtrl : UserControl, INotifyPropertyChanged
|
||||||
{
|
{
|
||||||
private static readonly object locker = new object();
|
private static readonly object locker = new object();
|
||||||
|
|
||||||
public static bool IsAutoBuy { get; set; } = false;
|
public static bool IsAutoBuy { get; set; } = false;
|
||||||
|
public static DateTime LastGetOrderTime { get; set; } = DateTime.Now;
|
||||||
public CheckBox chkSelectAll = null;
|
public CheckBox chkSelectAll = null;
|
||||||
OrderFilterConfig _orderFilterConfig;
|
OrderFilterConfig _orderFilterConfig;
|
||||||
public OrderFilterConfig orderFilterConfig
|
public OrderFilterConfig orderFilterConfig
|
||||||
|
|||||||
@@ -604,6 +604,7 @@ namespace AllBase
|
|||||||
|
|
||||||
public static string PassWordBak { get; set; }
|
public static string PassWordBak { get; set; }
|
||||||
public static string Mobile { get; set; }
|
public static string Mobile { get; set; }
|
||||||
|
public static bool AllowTraditionalBuyAddress { get; set; }
|
||||||
public static string ParentAuthority { get; set; }
|
public static string ParentAuthority { get; set; }
|
||||||
public static string ForbiddenPage { get; set; }
|
public static string ForbiddenPage { get; set; }
|
||||||
public static string UserAuthority { get; set; }
|
public static string UserAuthority { get; set; }
|
||||||
|
|||||||
@@ -52,6 +52,19 @@ namespace AllBase.Model.DBModel
|
|||||||
VoidPackageTypeStr = "";
|
VoidPackageTypeStr = "";
|
||||||
if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed;
|
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); }
|
set { this.SetValue(x => x.VoidPackageTypeStr, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 拍单时是否可以使用繁体字地址
|
||||||
|
/// </summary>
|
||||||
|
//public bool CanUseTraditionalAddress
|
||||||
|
//{
|
||||||
|
// get { return this.GetValue(x => x.CanUseTraditionalAddress); }
|
||||||
|
// set { this.SetValue(x => x.CanUseTraditionalAddress, value); }
|
||||||
|
//}
|
||||||
|
|
||||||
///// <summary>
|
///// <summary>
|
||||||
///// 订单对应店铺
|
///// 订单对应店铺
|
||||||
///// </summary>
|
///// </summary>
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ namespace Work
|
|||||||
}
|
}
|
||||||
|
|
||||||
BaseClass.ParentAuthority = BaseRegex.GetStringJson(ref html, "parent_authority").ParseToString();
|
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.ForbiddenPage = BaseRegex.GetStringJson(ref html, "forbidden_page").ParseToString();
|
||||||
BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile");
|
BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile");
|
||||||
BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt();
|
BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt();
|
||||||
|
|||||||
@@ -109,7 +109,21 @@ namespace TemuKJD.ToolForms
|
|||||||
//txtBuyTransitWarehouseRandomStr = value;
|
//txtBuyTransitWarehouseRandomStr = value;
|
||||||
var numberDic = TransitWarehouseData.dicChineseNumberChar;
|
var numberDic = TransitWarehouseData.dicChineseNumberChar;
|
||||||
var txtBuyTransitWarehouseRandomStrTmp = txtBuyTransitWarehouseRandomStr = transitWarehouse.TransFullAddress + Randomx.GetId(1, 35) + Randomx.GetId(1, 9).ToString().PadLeft(2, '0') + "室";
|
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++)
|
for (int i = 0; i < 10 && txtBuyTransitWarehouseRandomStrTmp == txtBuyTransitWarehouseRandomStr; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user