Merge remote-tracking branch 'origin/center-channel' into center-channel

center-channel/app/base/service/impl/common/qcCenterOrderSve.js

@@ -48,12 +48,12 @@ class QcCenterOrderService extends AppServiceBase {
         CompanyName: solution.CompanyName, IcpType: solution.IcpType, CompanyAddress: solution.CompanyAddress,
         Area: solution.Area, Note: solution.Note
       };
-      if(needsolution.channelSolutionNo){
+      if (needsolution.channelSolutionNo) {
         pushObj["BizId"] = needsolution.channelSolutionNo;
       }
       var self = this;
       //推送方案
-      this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
+      await this.pushIcpSolution(pushObj, needsolution.solutionNo, pobj.appInfo, self);
       return system.getResultSuccess();
     }
     return res;
@@ -76,7 +76,21 @@ class QcCenterOrderService extends AppServiceBase {
         var a = await self.reqCenterOrderApi(reqObj2);//保存渠道方案id
         if (a && a.status == 0) {
           //推送方案确认信息
-          await self.aliclient.reqbyget({action:"ConfirmIntention",reqbody:{BizId:pushObj.IntentionBizId},apiVersion:"2019-05-08"});
+          var confirmRes = await self.aliclient.reqbyget({ action: "ConfirmIntention", reqbody: { BizId: pushObj.IntentionBizId }, apiVersion: "2019-05-08" });
+          if (confirmRes && confirmRes.status == 0 && confirmRes.data) {
+            var confirmResData = confirmRes.data;
+            if (confirmResData.confirmUrl) {
+              var reqObj3 = {
+                actionType: "receiveIcpConfirmUrl",
+                appInfo: appInfo,
+                actionBody: {
+                  solutionNo: solutionNo,
+                  confirmUrl: confirmResData.confirmUrl
+                }
+              };
+              var a = await self.reqCenterOrderApi(reqObj3);//保存用户确认方案url
+            }
+          }
         }
       }
     }
@@ -96,7 +110,7 @@ class QcCenterOrderService extends AppServiceBase {
         BizId: ab.BizId, Note: ab.Note
       };
       //关闭方案
-      this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj,apiVersion:"2019-05-08"});
+      this.aliclient.reqbyget({ action: "CloseIcpProduce", reqbody: pushObj, apiVersion: "2019-05-08" });
       return system.getResultSuccess();
     }
     return res;
@@ -132,7 +146,7 @@ class QcCenterOrderService extends AppServiceBase {
       };
       var self = this;
       //推送方案材料
-      self.aliclient.reqbyget({action:"SavePartnerSubmitMaterial",reqbody:pushObj,apiVersion:"2019-05-08"});
+      self.aliclient.reqbyget({ action: "SavePartnerSubmitMaterial", reqbody: pushObj, apiVersion: "2019-05-08" });
       return system.getResultSuccess();
     }
     return res;
@@ -143,12 +157,12 @@ class QcCenterOrderService extends AppServiceBase {
     if (res && res.status == 0 && res.data) {
       //推送数据至阿里
       var pushObj = {
-        BizId:res.data.BizId,
-        OfficialFileURL:res.data.OfficialFileURL,
-        ApplicationStatus:res.data.ApplicationStatus
+        BizId: res.data.BizId,
+        OfficialFileURL: res.data.OfficialFileURL,
+        ApplicationStatus: res.data.ApplicationStatus
       };
       //推送状态变更
-      this.aliclient.reqbyget({action:"AcceptPartnerNotification",reqbody:pushObj,apiVersion:"2019-05-08"});
+      this.aliclient.reqbyget({ action: "AcceptPartnerNotification", reqbody: pushObj, apiVersion: "2019-05-08" });
       return system.getResultSuccess();
     }
     return res;
@@ -164,7 +178,7 @@ class QcCenterOrderService extends AppServiceBase {
         BizId: needsolution.channelSolutionNo, Note: ab.note
       };
       //关闭方案
-      this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj,apiVersion:"2019-05-08"});
+      this.aliclient.reqbyget({ action: "CloseIcpProduce", reqbody: pushObj, apiVersion: "2019-05-08" });
       return system.getResultSuccess();
     }
     return res;

center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -219,7 +219,7 @@ class UtilsNeedService extends AppServiceBase {
       self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
       return system.getResultSuccess();
     } else {
-      return system.getResult(null, "close fail　100389");
+      return system.getResult(null, "close fail　100389  ");
     }
 
   }
@@ -374,35 +374,38 @@ class UtilsNeedService extends AppServiceBase {
   }
 
   async writeCommunicationLog(pobj) {
-    if (!pobj.actionBody.BizId) {
-      return system.getResult(null, "actionBody.BizId can not be empty，100491");
+    if (!pobj.actionBody.intentionBizId) {
+      return system.getResult(null, "actionBody.intentionBizId can not be empty，100491");
     }
-    if (!pobj.actionBody.Note) {
-      return system.getResult(null, "actionBody.Note can not be empty，100492");
+    if (!pobj.actionBody.note) {
+      return system.getResult(null, "actionBody.note can not be empty，100492");
     }
     var self = this;
     var reqUrl = this.centerOrderUrl + "action/need/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
-    let res = await self.aliclient.reqbyget({ action: "WriteCommunicationLog", reqbody: { BizId: pobj.actionBody.BizId, Note: pobj.actionBody.Note }, apiVersion: "2019-05-08" });
+    let res = await self.aliclient.reqbyget({ action: "WriteCommunicationLog", reqbody: { BizId: pobj.actionBody.intentionBizId, Note: pobj.actionBody.note }, apiVersion: "2019-05-08" });
     return result;
   }
 
   async queryExpertApplyCommunicationLogs(pobj) {
-    if (!pobj.actionBody.BizId) {
-      return system.getResult(null, "actionBody.BizId can not be empty，100493");
+    if (!pobj.actionBody.intentionBizId) {
+      return system.getResult(null, "actionBody.intentionBizId can not be empty，100493");
     }
-    if (!pobj.actionBody.UserFeedBack) {
-      return system.getResult(null, "actionBody.UserFeedBack can not be empty，100494");
+    if (!pobj.actionBody.userFeedBack) {
+      return system.getResult(null, "actionBody.userFeedBack can not be empty，100494");
     }
     let res = await self.aliclient.reqbyget({
       action: "queryExpertApplyCommunicationLogs", reqbody: {
         BeginTime: pobj.actionBody.BeginTime ? pobj.actionBody.BeginTime : "",
         EndTime: pobj.actionBody.EndTime ? pobj.actionBody.EndTime : "",
-        BizId: pobj.actionBody.BizId,
-        UserFeedBack: pobj.actionBody.UserFeedBack,
+        BizId: pobj.actionBody.intentionBizId,
+        UserFeedBack: pobj.actionBody.userFeedBack,
+        PageNum: pobj.actionBody.pageNum || 1,
+        PageSize: pobj.actionBody.pageSize || 10,
         apiVersion: "2019-05-08"
       }
     });
+    console.log(res);
     return res;
   }
 
@@ -427,4 +430,7 @@ class UtilsNeedService extends AppServiceBase {
 module.exports = UtilsNeedService;
 
 // var a=new UtilsNeedService();
-// a.test1();
\ No newline at end of file
+// a.queryExpertApplyCommunicationLogs({intentionBizId:20200803095203000001,userFeedBack:true});
+
+
+

center-channel/app/config/settings.js

@@ -60,7 +60,8 @@ var settings = {
   },  
   qifuH5PayNotifyUrl: function () {
     if (this.env == "dev") {
-      return "http://gsb.qifu.gongsibao.com:4012/tlpay/notify";
+    //   return "http://gsb.qifu.gongsibao.com:4012/tlpay/notify";
+        return "http://gsb.qifu-dev.gongsibao.com/tlpay/notify"// 2020 0804 lin 修改测试环境tl回调地址
     } else {
       return "http://gsb.qifu.gongsibao.com/tlpay/notify";
     }