update 2.4

center-order/app/base/api/impl/action/ediApi.js

@@ -25,14 +25,17 @@ class ediApi extends APIBase {
         var opResult = null;
         var opResult = null;
         switch (action_type) {
         switch (action_type) {
             case "produceNoticeAliEsp":// uk后端订单拉取功能
             case "produceNoticeAliEsp":// uk后端订单拉取功能
-                opResult = await this.needinfoSve.produceNoticeAliEsp(pobj,pobj.actionBody);
-                break;
+              opResult = await this.needinfoSve.produceNoticeAliEsp(pobj,pobj.actionBody);
+              break;
             case "receiveEdiStatusNotify"://接收渠道方案状态变更通知2.3
             case "receiveEdiStatusNotify"://接收渠道方案状态变更通知2.3
-                opResult = await this.aliyunqcSve.receiveEdiStatusNotify(pobj);
-                break;
+              opResult = await this.aliyunqcSve.receiveEdiStatusNotify(pobj);
+              break;
+            case "soulutionFeebackAliEsp"://接收渠道方案状态变更通知2.4
+              opResult = await this.aliyunqcSve.soulutionFeebackAliEsp(pobj);
+              break;
             default:
             default:
-                opResult = system.getResult(null, "action_type参数错误");
-                break;
+              opResult = system.getResult(null, "action_type参数错误");
+              break;
         }
         }
         return opResult;
         return opResult;
     }
     }

center-order/app/base/service/impl/qcutils/aliyunqcSve.js

@@ -933,7 +933,8 @@ class AliyunQcService {
     }
     }
     //获取方案信息
     //获取方案信息
     var ns = await this.needsolutionDao.model.findOne({
     var ns = await this.needsolutionDao.model.findOne({
-      where: { channelSolutionNo: ab.BizId, isInvalid: 0 }, raw: true
+      // 2020 0929 lin 修改ab.BizId 改为 ab.solutionBizId
+      where: { channelSolutionNo: ab.solutionBizId, isInvalid: 0 }, raw: true
     });
     });
     if (!ns || !ns.id) {
     if (!ns || !ns.id) {
       return system.getResultFail(-102, "未知方案");
       return system.getResultFail(-102, "未知方案");
@@ -997,8 +998,10 @@ class AliyunQcService {
     var material = solutionContent.customerMaterial || {};
     var material = solutionContent.customerMaterial || {};
     if (ab.extInfo) {
     if (ab.extInfo) {
       // 退回修改理由
       // 退回修改理由
+      var extInfoJson = JSON.parse(ab.extInfo);
       if(ab.extInfo.rejectReason) {
       if(ab.extInfo.rejectReason) {
-        ab.rejectReason = ab.extInfo.rejectReason
+        ab.rejectReason = ab.extInfo.rejectReason,
+        solutionContent.note = ab.rejectReason
       }
       }
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
       material.businessLicenseArr = ab.extInfo.businessLicenseArr;
       material.idCardListArr = ab.idCardListArr;
       material.idCardListArr = ab.idCardListArr;