优化物流费

SiteCore/Handler/sync.order.cs

@@ -61,7 +61,7 @@ namespace SiteCore.Handler
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
             //string a = SecurityHelper.DecryptSymmetric("YDaPXIhsKgw=");
-            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\水标售价.xlsx");
+            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\水标售价(1).xlsx");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -7162,9 +7162,9 @@ namespace SiteCore.Handler
             else
             {
                 lw.Add(string.Format("(AfterSaleState = 3)"));
+                lw.Add("type = 0");
                 string reasonState = GetPostString("reasonState");
-                if (posCode == "SysAdmin" || posCode == "AfterSaleMaster" || posCode == "AfterSale"
-                    || posCode == "Summarize" || posCode == "Finance")
+                if (posCode == "SysAdmin" || posCode == "AfterSaleMaster" || posCode == "AfterSale" || posCode == "Summarize" || posCode == "Finance")
                 {
                     if (reasonState == "2")
                     {
@@ -11058,8 +11058,8 @@ namespace SiteCore.Handler
                         {
                             entity.OrderState = 3;
                         }
-
                         commonHelper.getCytPrice(entity);
+                        tmcHelper.dealOldCustomerEntityTag(ref entity, ceErpTrade);
                     }
                     entity.Update();
                     LogHelper.addLog(entity.ctid, CurrentUser.UserID, "审核通过", entity.OrderState);

SiteCore/taobao/commonHelper.cs

@@ -2181,11 +2181,11 @@ namespace SiteCore
                 string response1 = HttpPost("http://www.kiy.cn/webapi/Himall.NewShop.UpdOrderExpress", jsonObject12.ToString());
                 JObject jsonObjects1 = JObject.Parse(response1);
                 string msg = (string)jsonObjects1["msg"];
-                LogHelper.addLog(exinfo.tid, 0, "CYT售后单推送：" + msg);
+                LogHelper.addLog(exinfo.tid, 0, "CYT打单推送：" + msg);
             }
             catch (Exception ex)
             {
-                LogHelper.addLog(exinfo.tid, 0, "CYT售后单推送：" + ex.ToString());
+                LogHelper.addLog(exinfo.tid, 0, "CYT打单推送：" + ex.ToString());
             }
         }
 
@@ -2796,7 +2796,7 @@ namespace SiteCore
                 dispatchSort = 0;
 
             }
-            if ("无".Equals(result))
+            if ("无".Equals(result) && spu_shopIds.Contains(ceErpTradeCell.ShopId))
             {
                 ceErpTradeCellExtend.ToType = "内部";
 

SiteCore/taobao/tmcHelper.cs

@@ -1511,6 +1511,8 @@ namespace SiteCore
                 if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
                 {
                     entity.OrderState = -1;
+                    entity.DesignUserId = 0;
+                    entity.WaitDesignTime = null;
                 }
                 if (ishaveBu)
                 {
@@ -1575,6 +1577,8 @@ namespace SiteCore
                     if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
                     {
                         entity.OrderState = -1;
+                        entity.DesignUserId = 0;
+                        entity.WaitDesignTime = null;
                     }
                     father.create_time = DateTime.Now;
                     father.Update();
@@ -1586,6 +1590,8 @@ namespace SiteCore
                     if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
                     {
                         entity.OrderState = -1;
+                        entity.DesignUserId = 0;
+                        entity.WaitDesignTime = null;
                     }
                     entity.IsSample = 1;
                     entity.UpdateTime = DateTime.Now;
@@ -2024,6 +2030,8 @@ namespace SiteCore
             if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
             {
                 entity.OrderState = -1;
+                entity.DesignUserId = 0;
+                entity.WaitDesignTime = null;
             }
             if (isNull)
             {
@@ -2197,6 +2205,8 @@ namespace SiteCore
             if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
             {
                 entity.OrderState = -1;
+                entity.DesignUserId = 0;
+                entity.WaitDesignTime = null;
             }
             if (isNull)
             {
@@ -2383,6 +2393,8 @@ namespace SiteCore
             if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
             {
                 entity.OrderState = -1;
+                entity.DesignUserId = 0;
+                entity.WaitDesignTime = null;
             }
             if (isNull)
             {
@@ -2558,6 +2570,8 @@ namespace SiteCore
             if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
             {
                 entity.OrderState = -1;
+                entity.DesignUserId = 0;
+                entity.WaitDesignTime = null;
             }
             if (isNull)
             {
@@ -2942,6 +2956,8 @@ namespace SiteCore
             if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
             {
                 entity.OrderState = -1;
+                entity.DesignUserId = 0;
+                entity.WaitDesignTime = null;
             }
             if (ishave)
             {
@@ -3363,6 +3379,8 @@ namespace SiteCore
             if ((father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip)) || entity.seller_memo.IndexOf("不要切单个") > -1 || commonHelper.isFarAddress(father.receiver_state))
             {
                 entity.OrderState = -1;
+                entity.DesignUserId = 0;
+                entity.WaitDesignTime = null;
             }
             if (ishave)
             {

Web/EArc/ProductManager.aspx

@@ -166,7 +166,7 @@ html += getGridBtn("memo", "表单", "addnewFn('" + id + "')");
                 <div type="indexcolumn" width="20"></div>
 
                 <div field="PType" width="100" align="center" headerAlign="center">产品类型</div>
-
+                <div field="uuid" width="100" align="center" headerAlign="center">产品标识</div>
                 <div field="PNum" renderer="conFn" width="180" align="center" headerAlign="center">数量</div>
                 <div field="PMaterial" width="180" align="center" headerAlign="center">材质</div>
                 <div field="PCraft" width="150" align="center" headerAlign="center">工艺</div>