tmconfirm

fqboss/app/base/api/impl/channelreceiveApi.js

@@ -222,12 +222,12 @@ class ChannelReceiveApi {
       } else {
       } else {
         return { code: -100, msg: "未知应用" };
         return { code: -100, msg: "未知应用" };
       }
       }
-      var channel = await this.channelSve.getChannelItem(appInfo.app_code);
-      if (channel) {
-        obj["channel"] = channel
-      } else {
-        return { code: -101, msg: "未知渠道" };
-      }
+      // var channel = await this.channelSve.getChannelItem(appInfo.app_code);
+      // if (channel) {
+      //   obj["channel"] = channel
+      // } else {
+      //   return { code: -101, msg: "未知渠道" };
+      // }
       // var user = await this.getUserInfo(userInfo, appInfo,app);
       // var user = await this.getUserInfo(userInfo, appInfo,app);
       // if (user) {
       // if (user) {
       //   obj["user"] = user;
       //   obj["user"] = user;

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

@@ -465,14 +465,14 @@ class ChannelReceiveService {
       return system.getResultFail(-103, "isConfirm参数错误");
       return system.getResultFail(-103, "isConfirm参数错误");
     }
     }
     // 1.获取交付单信息
     // 1.获取交付单信息
-    var orderItem = await this.dao.model.findOne({
+    var orderItem = await this.orderSve.dao.model.findOne({
       where: { channelOrderNum: serviceNo, channelCode: obj.channelCode },
       where: { channelOrderNum: serviceNo, channelCode: obj.channelCode },
       raw: true
       raw: true
     });
     });
     if (!orderItem) {
     if (!orderItem) {
       return { code: -102, msg: "系统中未查到相应订单，无法修改" };
       return { code: -102, msg: "系统中未查到相应订单，无法修改" };
     }
     }
-    var tms = await self.trademarkDao.model.findAll({ where: { channelOrderNum: serviceNo, orderNum: orderItem.orderNum }, raw: true });
+    var tms = await self.orderSve.trademarkDao.model.findAll({ where: { channelOrderNum: serviceNo, orderNum: orderItem.orderNum }, raw: true });
     var tradem = null;
     var tradem = null;
     for (var i = 0; i < tms.length; i++) {
     for (var i = 0; i < tms.length; i++) {
       tradem = tms[i];
       tradem = tms[i];
@@ -492,7 +492,7 @@ class ChannelReceiveService {
     if (isConfirm == "1") {
     if (isConfirm == "1") {
       tmObj["tmStatus"] = "WAITARTIFICIALEXAMINE";
       tmObj["tmStatus"] = "WAITARTIFICIALEXAMINE";
     }
     }
-    await this.trademarkDao.model.update(tmObj, {
+    await this.orderSve.trademarkDao.model.update(tmObj, {
       where: { orderNum: orderItem.orderNum }
       where: { orderNum: orderItem.orderNum }
     });
     });
     return { code: 1 };
     return { code: 1 };