update

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

@@ -936,7 +936,8 @@ class UtilsOrderService extends AppServiceBase {
         uapp_id: appInfo.uapp_id,
         uapp_id: appInfo.uapp_id,
         uapp_key: appInfo.uapp_key,
         uapp_key: appInfo.uapp_key,
         app_code: appInfo.app_code,
         app_code: appInfo.app_code,
-        app_name: appInfo.app_name
+        app_name: appInfo.app_name,
+        contact_mobile:appInfo.contact_mobile
       };
       };
       opOrderResult.data.userInfo = {
       opOrderResult.data.userInfo = {
         channel_userid: opOrderResult.data.order_info.channelUserId,
         channel_userid: opOrderResult.data.order_info.channelUserId,
@@ -954,9 +955,18 @@ class UtilsOrderService extends AppServiceBase {
         actionBody: opOrderResult.data
         actionBody: opOrderResult.data
       }
       }
       // 推送
       // 推送
-      this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
+      let yfRet = await this.utilsPushSve.pushBusInfo(pobj, "pushOrder", 0);
+      if(yfRet.status !=0){
+        return yfRet;
+      }
       if (['icpsq', 'edisq'].includes(opOrderResult.data.product_info.channel_item_code)) {
       if (['icpsq', 'edisq'].includes(opOrderResult.data.product_info.channel_item_code)) {
         //创建方案
         //创建方案
+        pobj.salesmanInfo ={
+          "salesmanId":yfRet.data.orderList[0].operator || "",
+          "salesmanName":yfRet.data.orderList[0].operatorName || "",
+          "salesmanMobile":yfRet.data.orderList[0].phone ||"",
+          "salesmanChannelId":yfRet.data.orderList[0].channelUserId || ""
+        }
         let pushRet = await this.packagingPushData(pobj);
         let pushRet = await this.packagingPushData(pobj);
         if (pushRet.status != 0) {
         if (pushRet.status != 0) {
           throw new Error('推送失败')
           throw new Error('推送失败')
@@ -997,7 +1007,7 @@ class UtilsOrderService extends AppServiceBase {
       "CompanyName": "",
       "CompanyName": "",
       "licenseType": "",
       "licenseType": "",
       "solutionCity": ab.product_info.price_item.price_desc,
       "solutionCity": ab.product_info.price_item.price_desc,
-      "solutionPrice": ab.order_info.totalSum,
+      "solutionPrice": Number(ab.order_info.totalSum)*100,
       "channelTypeCode": ab.product_info.service_business_code,
       "channelTypeCode": ab.product_info.service_business_code,
       "companyLocation": ab.product_info.price_item.price_desc
       "companyLocation": ab.product_info.price_item.price_desc
     }
     }
@@ -1005,14 +1015,15 @@ class UtilsOrderService extends AppServiceBase {
       "status": "USER_PAY_PRODUCE",
       "status": "USER_PAY_PRODUCE",
       "bizType": ab.product_info.channel_item_code,
       "bizType": ab.product_info.channel_item_code,
       "solution": solution,
       "solution": solution,
-      "totalSum": ab.order_info.totalSum,
+      "totalSum": Number(ab.order_info.totalSum)*100,
       "typeCode": ab.product_info.channel_item_code,
       "typeCode": ab.product_info.channel_item_code,
       "typeName": ab.product_info.channel_item_name,
       "typeName": ab.product_info.channel_item_name,
       "statusName": "⽤户⽀付",
       "statusName": "⽤户⽀付",
       "customerInfo": {
       "customerInfo": {
-        "publishName": "",
-        "publishMobile": ""
-      }
+        "publishName": ab.order_contact.contactName || "",
+        "publishMobile": ab.order_contact.mobile || ""
+      },
+      "salesmanInfo":pobj.salesmanInfo
     }
     }
     //推送数据
     //推送数据
     let pushObj = {
     let pushObj = {

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

@@ -63,6 +63,7 @@ class UtilsPushService extends AppServiceBase {
       return system.getResult(null, "暂无【" + opType + "】的推送配置");
       return system.getResult(null, "暂无【" + opType + "】的推送配置");
     }
     }
     var self = this;
     var self = this;
+    let result;
     if(interface_list_temp && interface_list_temp.length==1){
     if(interface_list_temp && interface_list_temp.length==1){
       const element = interface_list_temp[0];
       const element = interface_list_temp[0];
       var reflexActionRes = await self.reflexAction(element, opType, pobj, isDelProductInfo);
       var reflexActionRes = await self.reflexAction(element, opType, pobj, isDelProductInfo);
@@ -70,8 +71,9 @@ class UtilsPushService extends AppServiceBase {
     }else{
     }else{
       for (let index = 0; index < interface_list_temp.length; index++) {
       for (let index = 0; index < interface_list_temp.length; index++) {
         const element = interface_list_temp[index];
         const element = interface_list_temp[index];
-        await self.reflexAction(element, opType, pobj, isDelProductInfo);
+        result = await self.reflexAction(element, opType, pobj, isDelProductInfo);
       }
       }
+      return result;
     }
     }
 
 
   }
   }

center-channel/app/config/settings.js

@@ -246,7 +246,7 @@ var settings = {
     if (this.env == "dev") {
     if (this.env == "dev") {
       return "http://180.163.239.98:38085/"// 360测试环境
       return "http://180.163.239.98:38085/"// 360测试环境
     } else {
     } else {
-      return "http://180.163.239.98:38085/"//
+      return "https://console.e.360.cn/"//
     }
     }
   },
   },
   aliUappId: function () {
   aliUappId: function () {