diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 5130fac..5083c40 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -292,7 +292,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
//Dispatcher.Invoke(new Action(() => { item.UpdateOrderItemBuyButton(); }));
// 关联拍单关系 // 危险物品禁止拍单,仅关联安全商品
- if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
+ //if (!GlobalConfig.lstDangerItemWord.Any(d => (item.title).ParseToString().Contains(d)))
{
item.BuyMap = byuMapList.FirstOrDefault(b => b.sku_code == item.out_sku_id && b.spu_code == item.out_product_id);
if (item.BuyMap == null)
diff --git a/AllBase/29WxOrderAllBase.csproj b/AllBase/29WxOrderAllBase.csproj
index d10f1dd..0018bc1 100644
--- a/AllBase/29WxOrderAllBase.csproj
+++ b/AllBase/29WxOrderAllBase.csproj
@@ -168,6 +168,7 @@
+
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 5d96126..1dfe503 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -32,7 +32,7 @@ namespace AllBase
/// 版本ID
///
- public static int VersionCount = 218;
+ public static int VersionCount = 219;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000";
@@ -197,8 +197,9 @@ namespace AllBase
///
public static int ShopPointsPerMonth { get; set; } = 30;
public static decimal Balance { get; set; } = 0;
- public static decimal PostagePerOrder { get; set; } = 2.2m;
- public static int AlimamaPageCount = 0;
+ public static decimal PostagePerOrder { get; set; } = 2.2m;
+ public static decimal PostagePerOrderDiff { get { return PostagePerOrder - 2.2m; } }
+ public static int AlimamaPageCount = 0;
public static bool CloudTitle = false;
public static bool CloudBrand = false;
public static bool CloudSellerNick = false;
diff --git a/AllBase/Model/Config/WarehousePostageInfo.cs b/AllBase/Model/Config/WarehousePostageInfo.cs
new file mode 100644
index 0000000..1adce73
--- /dev/null
+++ b/AllBase/Model/Config/WarehousePostageInfo.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Config
+{
+ public class WarehousePostageInfo
+ {
+ public static Dictionary DicWarehousePostage { get; set; } = new Dictionary()
+ {
+ { "湖北", 2.2m },
+ { "湖南", 2.2m },
+ { "江西", 2.2m },
+ { "河南", 2.2m },
+ { "上海", 3m },
+ { "浙江", 2.2m },
+ { "安徽", 2.2m },
+ { "江苏", 2.2m },
+ { "河北", 2.2m },
+ { "山东", 2.2m },
+ { "福建", 2.2m },
+ { "广东", 2.2m },
+ { "深圳", 2.8m },
+ { "天津", 2.2m },
+ { "北京", 3.2m },
+ { "山西", 2.2m },
+ { "陕西", 2.2m },
+ { "广西", 2.2m },
+ { "云南", 2.2m },
+ { "贵州", 2.2m },
+ { "四川", 2.2m },
+ { "重庆", 2.2m },
+ { "黑龙江", 2.7m },
+ { "吉林", 2.7m },
+ { "辽宁", 2.7m },
+ { "青海", 2.7m },
+ { "宁夏", 2.7m },
+ { "甘肃", 2.7m },
+ { "内蒙", 4.5m },
+ { "海南", 4.5m },
+ { "新疆", 12.5m },
+ { "西藏", 12.5m },
+ };
+ }
+}
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
index 1558c6c..5bc42cb 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
@@ -1,6 +1,7 @@
using AllBase;
using AllBase.Helper;
using AllBase.Model;
+using AllBase.Model.Config;
using AllBase.Model.DBModel;
using AllBase.Model.Result;
using CefSharp;
@@ -994,8 +995,13 @@ namespace TemuKJD.ToolForms
{
body["userName"] = BaseClass.UserName; // 软件端用户名
body["purchaserNote"] = BaseClass.UserName + "-" + BaseClass.NickName; // 购买软件账户备注
- body["postage"] = (BaseClass.PostagePerOrder * 100).ParseToInt() + "";
- }
+
+ string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
+ decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
+
+ body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
+ body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
+ }
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var dataStr = JsonHelper.SerializeObject(body);
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +