tj

center-order/app/base/service/impl/utilsSve/utilsChannelTmDeliverySve.js

@@ -8,7 +8,7 @@ class UtilsChannelTmDeliveryService {
   //=================================修改渠道交付信息==============start======================================
 
   async addAliChannelTmApplicant(actionBody) {//新增ali渠道商标交付信息
-    var itemResult = await this.getChannelDelivery(actionBody.orderNo);
+    var itemResult = await this.getChannelDeliveryByChannelOrderNo(actionBody.orderNo, actionBody.channelOrderNo);
     if (itemResult.status != 0) {
       this.addChannelDelivery(actionBody.deliveryData, actionBody.orderNo, actionBody.channelOrderNo)
       return system.getResultSuccess();
@@ -78,6 +78,15 @@ class UtilsChannelTmDeliveryService {
     }
     return system.getResultSuccess(list[0].deliveryContent);
   }
+  async getChannelDeliveryByChannelOrderNo(orderNo, channelOrderNo) {//查询渠道交付信息--内部调用
+    var sql = "select * from c_channel_delivery where sourceOrderNo=:sourceOrderNo and channelOrderNo=:channelOrderNo";
+    var paramWhere = { sourceOrderNo: orderNo, channelOrderNo: channelOrderNo };
+    var list = await this.orderinfoDao.customQuery(sql, paramWhere);
+    if (!list || list.length == 0 || !list[0].deliveryContent) {
+      return system.getResult(null, "get channel delivery data is empty，30250");
+    }
+    return system.getResultSuccess(list[0].deliveryContent);
+  }
   //=================================修改渠道交付信息==============end======================================