修改台湾身份信息

SiteCore/Handler/sync.order.cs

@@ -1477,11 +1477,11 @@ namespace SiteCore.Handler
                 CeErpTradeCell entity = null;
                 if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
                 CeErpTrade father = CeErpTrade.Get(entity.tid);
-                if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
+                /*if (father.receiver_state.Contains("台湾") && string.IsNullOrEmpty(father.receiver_zip))
                 {
                     returnErrorMsg("台湾客户需填写身份证号！");
                     return;
-                }
+                }*/
                 if (commonHelper.isFarAddress(father.receiver_state) && father.delivery_paymant == 0)
                 {
                     returnErrorMsg("偏远地区需要填写物流费！");
@@ -5355,7 +5355,7 @@ namespace SiteCore.Handler
                         commonHelper.UpdateRelationOrder(entity.ctid);
                         commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, dcomcode, outSid);
                         CeErpSukuraData.createInfo(entity.ctid, 4);
-                        if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
+                        if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126 || entity.SupplierId == 96)
                         {
                             commonHelper.sendCytExpress(exinfo);
                         }
@@ -6378,7 +6378,7 @@ namespace SiteCore.Handler
                                     commonHelper.UpdateRelationOrder(entity.ctid);
                                     CeErpSukuraData.createInfo(ctid, 4);
                                     commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, cpCode, curUseWayBillCode);
-                                    if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
+                                    if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126 || entity.SupplierId == 96)
                                     {
                                         commonHelper.sendCytExpress(exinfo);
                                     }
@@ -6418,7 +6418,7 @@ namespace SiteCore.Handler
                                 exinfo.Create();
                                 commonHelper.UpdateRelationOrder(entity.ctid);
                                 CeErpSukuraData.createInfo(entity.ctid, 4);
-                                if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
+                                if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126 || entity.SupplierId == 96)
                                 {
                                     commonHelper.sendCytExpress(exinfo);
                                 }
@@ -6529,7 +6529,7 @@ namespace SiteCore.Handler
                                     commonHelper.UpdateRelationOrder(ceErpTradeCell.ctid);
                                     CeErpSukuraData.createInfo(ctid, 4);
                                     commonHelper.insertToBuchaForDelivery(ceErpTrade.tid, ceErpTrade.posCode, cpCode, curUseWayBillCode);
-                                    if (ceErpTradeCell.SupplierId == 64 || ceErpTradeCell.SupplierId == 80 || entity.SupplierId == 126)
+                                    if (ceErpTradeCell.SupplierId == 64 || ceErpTradeCell.SupplierId == 80 || entity.SupplierId == 126 || entity.SupplierId == 96)
                                     {
                                         commonHelper.sendCytExpress(exinfo);
                                     }
@@ -6637,7 +6637,7 @@ namespace SiteCore.Handler
                     exinfo.print_time = DateTime.Now;
                     exinfo.printUser = CurrentUser.UserName;
                     exinfo.Create();
-                    if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
+                    if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126 || entity.SupplierId == 96)
                     {
                         commonHelper.sendCytExpress(exinfo);
                     }
@@ -11223,11 +11223,11 @@ namespace SiteCore.Handler
                     {
                         CeErpTrade ceErpTrade = CeErpTrade.Get(entity.tid);
                         CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
-                        if (!string.IsNullOrEmpty(ceErpTrade.receiver_state) && ceErpTrade.receiver_state.Contains("台湾") && string.IsNullOrEmpty(ceErpTrade.receiver_zip))
+                        /*if (!string.IsNullOrEmpty(ceErpTrade.receiver_state) && ceErpTrade.receiver_state.Contains("台湾") && string.IsNullOrEmpty(ceErpTrade.receiver_zip))
                         {
                             returnErrorMsg("台湾客户需填写身份证！");
                             return;
-                        }
+                        }*/
                         if (commonHelper.isFarAddress(ceErpTrade.receiver_state) && ceErpTrade.delivery_paymant == 0 && entity.IsSF != 2)
                         {
                             returnErrorMsg("偏远地区需要填写物流费！");
@@ -15201,7 +15201,7 @@ namespace SiteCore.Handler
                     ce = new CeErpTradeCellExtend();
                     ce.ctid = ctid;
                 }
-                ce.negotiate = negotiate;
+                ce.negotiate = negotiate + "-" + CurrentUser.UserName;
                 if (ce.ID > 0)
                 {
                     ce.Update();
@@ -15210,7 +15210,7 @@ namespace SiteCore.Handler
                 {
                     ce.Create();
                 }
-
+                LogHelper.addLog(ce.ctid, CurrentUser.UserID, "协商内容：" + negotiate, 0, 1);
                 returnSuccessMsg("保存成功");
             }
         }

SiteCore/taobao/apiShengda.cs

@@ -75,6 +75,12 @@ namespace SiteCore.Handler
         static string EncodingAESKey = "cig3Ax4wI9I1H9SlvCgPUQ==";*/
 
 
+        public void apiGetToken()
+        {
+            ReturnSuccess(JsonConvert.SerializeObject(getToken()));
+            return;
+        }
+
         public static string getToken()
         {
             //return "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYXBpIl0sInNjb3BlIjpbInJlYWQiLCJ3cml0ZSJdLCJleHAiOjE3MzU5NjU0ODAsImF1dGhvcml0aWVzIjpbIm9wZW5hcGkiXSwianRpIjoiYjY4NTRhZjctZjNmMy00OTU0LTk4ZmUtZDRlZTE4ZDllNzQyIiwiY2xpZW50X2lkIjoieGNsaWVudCJ9.E6U0NVMZPcUypl4P7L5718J1X8UxSJg9R7vZX_oMkuEJ-yelNXuYwu7-eAi1JTgIJ0GuuviQu-KEAH-W7sHb7t-JJJc-wLPMsLKmpwQDG2EpiRK5hW5ZmyUgL8rPuTUawKVP5k8SGrN60sVyXA2zKm4ztEQ39EGudXnam1Lld2w";

Web/EOrder/js/p_order.js

@@ -53,13 +53,11 @@ function orderAction(e) {
 
     if (record.OrderState == -1) {
         html += getGridBtn("info", "通过审核", "passToOrder('" + id + "')");
-        if (record.receiver_state.indexOf("台湾") > -1) {
-            html += getGridBtn("laboratory", "身份证", "setPersonIdInfo()");
-        }
         if (isFar(record.receiver_state)) {
             html += getGridBtn("split", "物流费", "addDeliveryPaymant()");
         }
     }
+
     if (record.ctid.indexOf("S_") > -1) {
         if (userPostCode == "AfterSaleMaster" || userPostCode == "SysAdmin" || userPostCode == "AfterSale" || userId == "82" || userId == "2846") {
             html += getGridBtn("memo", "处理完成", "finishOrder('" + id + "')");
@@ -71,6 +69,12 @@ function orderAction(e) {
     html += getGridBtn("undo", "填写模板", "onSetTemplate('" + record.tempId + "')");
     if (record.OrderState < 7) {
         html += getGridBtn("word", "上传地址", "uploaderAddress('" + record.ctid + "','" + record.seller_memo + "')");
+
+    } if (record.OrderState < 5) {
+        if (record.receiver_state.indexOf("台湾") > -1) {
+            html += getGridBtn("laboratory", "身份证", "setPersonIdInfo()");
+        }
+
     }
     if (userPostCode == "AfterSale" || userPostCode == "AfterSaleMaster" || userPostCode == "SysAdmin") {
         html += getGridBtn("dis", "协商卡", "negotiate('" + record.ctid + "','" + record.negotiate + "')");