Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

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

@@ -1048,7 +1048,7 @@ class UtilsNeedService extends AppServiceBase {
         // 第二部 询价
         // 询价前县查出方案
         pobj.actionBody.channelSolutionNo = pobj.actionBody.solutionBizId;
-        pobj.actionType = "receiveSolutionPayInfo";
+        pobj.actionType = "getProgrammeInfoByChannelSolutionNo";
         var url = settings.centerOrderUrl() + "action/icapi/springBoard";
         var solutionrtn = await this.execClient.execPost(pobj, url);
         if (!solutionrtn || !solutionrtn.stdout) {
@@ -1065,7 +1065,7 @@ class UtilsNeedService extends AppServiceBase {
           pobj.actionBody.needId = solutiondata.data.channelNeedNo;
         }
         // 具体询价操作
-        // 城市 明天需要国旗存一下 这里也要询价
+        // 城市 明天需要国旗存一下 这里也要询价 2020 1017 已存
         pobj.actionBody.city = solutiondata.data.solutionContent.solution.solutionCity;
         // pobj.actionBody.city = needInfoResult.data.city
         pobj.actionBody.channelItemCode = needInfoResult.data.channelTypeCode;
@@ -1147,7 +1147,20 @@ class UtilsNeedService extends AppServiceBase {
         if (orderrtn.data) {
           pobj.actionBody.orderNo = orderrtn.data.orderNo;
         }
-        
+        // 2020 1017 lin 新增更新方案状态/价格/订单号
+        pobj.actionType = "receiveSolutionPayInfo";
+        var url = settings.centerOrderUrl() + "action/icapi/springBoard";
+        var solutionrtn = await this.execClient.execPost(pobj, url);
+        if (!solutionrtn || !solutionrtn.stdout) {
+          return system.getResultFail(-5011, "方案查询失败");
+        }
+        var solutiondata = JSON.parse(solutionrtn.stdout);
+        if (solutiondata.status != 0) {
+          return system.getResultFail(-5011, "方案查询失败");
+        }
+        if (!solutiondata.data) {
+          return system.getResultFail(-5012, "方案查询数据为空");
+        }
         // 第四步 整合推送参数 并推送
 
         var fqobj = {
@@ -1228,7 +1241,8 @@ class UtilsNeedService extends AppServiceBase {
     if(rtn.status) {
       return rtn;
     }
-    if ((actionBody.operationType == "USER_PAY_PRODUCE" || actionBody.operationType == "USER_UPLOAD_PRODUCE") && rtn.data) {
+    // 只有上传材料才在这里推送，produceNoticeAliEsp不做关于材料上传的推送
+    if ((actionBody.operationType == "USER_UPLOAD_PRODUCE") && rtn.data) {
       var deliveryObj = {
         actionBody: {
           orderNo: rtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,

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

@@ -908,6 +908,7 @@ class UtilsOrderService extends AppServiceBase {
       // }
       params.appInfo = { uapp_id: appInfo.uapp_id };
       params.pay_type = params.payType;
+      params.time_end = params.payTime;
       //修改并返回订单支付状态，创建收款单
       // 这里修改了order_info的状态（status/paytime等）
       var orderUrl = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotifyByChannel";