pp

fqboss/app/base/service/impl/orderSve.js

@@ -1748,7 +1748,7 @@ class OrderService extends ServiceBase {
   async updateInsideOrderDetailByOrderNum(obj, onlyCode) {
   async updateInsideOrderDetailByOrderNum(obj, onlyCode) {
     // console.log("商标自动提报专用#####################");
     // console.log("商标自动提报专用#####################");
     var self = this;
     var self = this;
-    var result = {code:-1745,msg:"修改失败"};
+    var result = { code: -1745, msg: "修改失败" };
     var channelorder = obj.channelorder;
     var channelorder = obj.channelorder;
     var user = obj.user;
     var user = obj.user;
     var app = obj.app;
     var app = obj.app;
@@ -1818,6 +1818,8 @@ class OrderService extends ServiceBase {
 
 
     var tms = await self.trademarkDao.model.findAll({ where: { orderNum: order.orderNum }, raw: true });
     var tms = await self.trademarkDao.model.findAll({ where: { orderNum: order.orderNum }, raw: true });
     var tradem = null;
     var tradem = null;
+    let updateNum1 = 0; //控制商标状态为12或13的变量
+    let updateNum2 = 0; //
     for (var i = 0; i < tms.length; i++) {
     for (var i = 0; i < tms.length; i++) {
       tradem = tms[i];
       tradem = tms[i];
       //------sy
       //------sy
@@ -1834,10 +1836,23 @@ class OrderService extends ServiceBase {
       // "SUBALITM": "已提交阿里(待补全信息)"
       // "SUBALITM": "已提交阿里(待补全信息)"
       // "REQALIERROR": "阿里接口错误(需峰擎系统处理)"
       // "REQALIERROR": "阿里接口错误(需峰擎系统处理)"
       // "SUBALITMOK": "已补全信息(待确认商标)",
       // "SUBALITMOK": "已补全信息(待确认商标)",
-      if (["WAITCONFIRM", "CONFIRMFAIL", "4", "FILLEXCEPTION", "READY", "DOCFINISH", "AWAITCHECK", "WAITARTIFICIALEXAMINE", "WAITCOMMIT", "ALIPAYREFUND", "ALIAUDITNOT", "ALICUSTOMERREJECTED", "SUBALITM", "REQALIERROR", "SUBALITMOK"].indexOf(tradem.tmStatus) < 0) {
-        return { code: "-140", msg: "存在状态为" + tradem.tmStatusName + "的商标，不能修改" };
+      //
+      if (tradem.tmStatus == "12" || tradem.tmStatus == "13") {
+        updateNum1++;
+      } else {
+        if (["WAITCONFIRM", "CONFIRMFAIL", "4", "FILLEXCEPTION", "READY", "DOCFINISH", "AWAITCHECK", "WAITARTIFICIALEXAMINE", "WAITCOMMIT", "ALIPAYREFUND", "ALIAUDITNOT", "ALICUSTOMERREJECTED", "SUBALITM", "REQALIERROR", "SUBALITMOK"].indexOf(tradem.tmStatus) < 0) {
+          updateNum2++;
+        }
       }
       }
     }
     }
+    if (updateNum1 > 0) {
+      //只修改联系地址并同步,然后return掉这个函数
+      let result = await self.contactAddressSyncUpdate(customer.contactAddress, customer.mobile, apply.applyName);
+      return ({ code: "1", msg: "该状态下成功修改联系人地址,其他信息不修改" });
+    }
+    else if (updateNum2 > 0) {
+      return { code: "-140", msg: "商标状态有误，不能修改" };
+    }
     tm["channelOrderListInfo"] = channelorder.order_nos && channelorder.order_nos.length > 0 ? channelorder.order_nos.join('，') : "";
     tm["channelOrderListInfo"] = channelorder.order_nos && channelorder.order_nos.length > 0 ? channelorder.order_nos.join('，') : "";
     tm["channelUserId"] = obj.channelUserId || "";
     tm["channelUserId"] = obj.channelUserId || "";
     tm["channelOrderNum"] = obj.channelOrderNum || "";
     tm["channelOrderNum"] = obj.channelOrderNum || "";
@@ -1969,7 +1984,7 @@ class OrderService extends ServiceBase {
 
 
   //将联系地址同步到该公司的其他订单数据中
   //将联系地址同步到该公司的其他订单数据中
   async contactAddressSyncUpdate(contactAddress, mobile, applyName) {
   async contactAddressSyncUpdate(contactAddress, mobile, applyName) {
-    let sql = "UPDATE h_tmcustomer_info SET contactAddress = '"+ contactAddress +"' WHERE id IN (SELECT id FROM (SELECT cu.id FROM h_tmapplier_info AS ap LEFT JOIN h_tmcustomer_info AS cu ON ap.orderNum = cu.orderNum WHERE cu.mobile = '"+ mobile +"' AND ap.applyName = '"+ applyName +"') AS a)";
+    let sql = "UPDATE h_tmcustomer_info SET contactAddress = '" + contactAddress + "' WHERE id IN (SELECT id FROM (SELECT cu.id FROM h_tmapplier_info AS ap LEFT JOIN h_tmcustomer_info AS cu ON ap.orderNum = cu.orderNum WHERE cu.mobile = '" + mobile + "' AND ap.applyName = '" + applyName + "') AS a)";
     let updateRes = await this.dao.customUpdate(sql);
     let updateRes = await this.dao.customUpdate(sql);
     return updateRes;
     return updateRes;
   }
   }