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

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

@@ -415,6 +415,9 @@ class RegCenterOrderService extends AppServiceBase {
           console.log('pushObj---pushObj---',pushObj)
           console.log('pushObj---pushObj---',pushObj)
           var pushBaiduRegSolution = await this.pushBaiduRegSolution(pushObj, pobj.appInfo, self);
           var pushBaiduRegSolution = await this.pushBaiduRegSolution(pushObj, pobj.appInfo, self);
           console.log('pushBaiduRegSolution+++',pushBaiduRegSolution)
           console.log('pushBaiduRegSolution+++',pushBaiduRegSolution)
+          if(pushBaiduRegSolution.status != 0 ){
+              return system.getResultFail(-101,pushBaiduRegSolution.msg)
+          }
         }
         }
         this.logCtl.info({
         this.logCtl.info({
           appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
           appid: pobj.appInfo ? pobj.appInfo.uapp_id || "" : "",
@@ -444,20 +447,18 @@ class RegCenterOrderService extends AppServiceBase {
     //推送方案信息
     //推送方案信息
     var pushRes = await self.baiduRegClient.baiduReqbyget({  path: "/v1/provider/demand?submitSolutions=", reqbody: pushObj });
     var pushRes = await self.baiduRegClient.baiduReqbyget({  path: "/v1/provider/demand?submitSolutions=", reqbody: pushObj });
     console.log("pushRes----",pushRes)
     console.log("pushRes----",pushRes)
-    if (pushRes && pushRes.status == 0 && pushRes.data) {
-      var resData = pushRes.data.data;
-      if (resData.infos) {
+    if (pushRes && pushRes.status == 0 && pushRes.data && pushRes.data.data && pushRes.data.data.infos) {
       var reqObj2 = {
       var reqObj2 = {
         actionType: "saveReginfo",
         actionType: "saveReginfo",
         appInfo: appInfo,
         appInfo: appInfo,
         actionBody: {
         actionBody: {
-            infos: resData.infos
+          infos: pushRes.data.data.infos
         }
         }
       };
       };
       var a = await self.reqCenterOrderApi(reqObj2);//保存渠道方案id,用户确认方案url
       var a = await self.reqCenterOrderApi(reqObj2);//保存渠道方案id,用户确认方案url
       console.log("保存渠道方案id,用户确认方案url aaaa++ ",a)
       console.log("保存渠道方案id,用户确认方案url aaaa++ ",a)
     }
     }
-    }
+    return pushRes;
   }
   }
 
 
   //reg关闭需求
   //reg关闭需求