1688

fqboss/app/base/controller/impl/orderCtl.js

@@ -751,10 +751,13 @@ class orderCtl extends CtlBase {
     if (obj && obj.tm.orderNum && obj.apply.orderNum && obj.customer.orderNum) {
     if (obj && obj.tm.orderNum && obj.apply.orderNum && obj.customer.orderNum) {
       try {
       try {
         var channelorder = await this.getChannelOrderByOrderNum({ channelOrderNum: channelOrderNum, type: "2", orderNum: obj.tm.orderNum, env: env }, "");
         var channelorder = await this.getChannelOrderByOrderNum({ channelOrderNum: channelOrderNum, type: "2", orderNum: obj.tm.orderNum, env: env }, "");
-        if (channelorder.code != 1) {
-          return channelorder;
+        // if (channelorder.code != 1) {
+        //   return channelorder;
+        // }
+        // obj["channelorder"] = channelorder.data;
+        if (channelorder.code == 1) {
+          obj["channelorder"] = channelorder.data;
         }
         }
-        obj["channelorder"] = channelorder.data;
         var result = await this.service.updateInsideOrderDetailByOrderNum2(obj, user.onlyCode);
         var result = await this.service.updateInsideOrderDetailByOrderNum2(obj, user.onlyCode);
         if (result.code == 1) {
         if (result.code == 1) {
           var tmList = await this.trademarkSve.findByChannelOrderNum(channelOrderNum, "1", "");
           var tmList = await this.trademarkSve.findByChannelOrderNum(channelOrderNum, "1", "");

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

@@ -1967,7 +1967,7 @@ class OrderService extends ServiceBase {
   async updateInsideOrderDetailByOrderNum2(obj, onlyCode) {
   async updateInsideOrderDetailByOrderNum2(obj, onlyCode) {
     console.log("商标自动提报专用#####################");
     console.log("商标自动提报专用#####################");
     var self = this;
     var self = this;
-    var channelorder = obj.channelorder;
+    var channelorder = obj.channelorder || {};
     var user = obj.user;
     var user = obj.user;
     var app = obj.app;
     var app = obj.app;
     var nclones = obj.nclones;
     var nclones = obj.nclones;
@@ -1989,14 +1989,24 @@ class OrderService extends ServiceBase {
       result.msg = "尼斯信息不能为空";
       result.msg = "尼斯信息不能为空";
       return result;
       return result;
     }
     }
-    var remainder = channelorder.remainder;
-    if (!remainder) {
-      return { code: "-203", msg: "渠道订单产品数量有误" };
-    } else if (nclones.length > Number(remainder)) {
-      return { code: "-204", msg: "渠道订单产品数量不足" };
-    }
+    // var remainder = channelorder.remainder;
+    // if (!remainder) {
+    //   return { code: "-203", msg: "渠道订单产品数量有误" };
+    // } else if (nclones.length > Number(remainder)) {
+    //   return { code: "-204", msg: "渠道订单产品数量不足" };
+    // }
     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 tmE = tms[0];
     var tmE = tms[0];
+    var remainder = channelorder.remainder;
+    if(tmE && tmE.tmSourceType && tmE.tmSourceType=='64'){//1688渠道不需要判断渠道订单
+      tm["channelPayStatus"] = tmE.channelPayStatus;
+    }else{
+      if (!remainder) {
+        return { code: "-203", msg: "渠道订单产品数量有误" };
+      } else if (nclones.length > Number(remainder)) {
+        return { code: "-204", msg: "渠道订单产品数量不足" };
+      }
+    }
     for (var i = 0; i < tms.length; i++) {
     for (var i = 0; i < tms.length; i++) {
       var tradem = tms[i];
       var tradem = tms[i];
       //------sy
       //------sy