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

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

@@ -362,6 +362,9 @@ class UtilsNeedService extends AppServiceBase {
       }
       }
       actionBody.newuserOtherList = newuserOtherList;
       actionBody.newuserOtherList = newuserOtherList;
     }
     }
+    if (actionBody.isDirectBuy&&(actionBody.status == 1||actionBody.status == 0)) {//已支付直购不调用
+      return system.getResultSuccess();
+    }
     pobj.actionType = "receiveIcpStatusNotify";
     pobj.actionType = "receiveIcpStatusNotify";
     var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
     var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
     var rtn = await this.restPostUrl(pobj, url);
     var rtn = await this.restPostUrl(pobj, url);
@@ -370,7 +373,7 @@ class UtilsNeedService extends AppServiceBase {
         actionBody: {
         actionBody: {
           orderNo: rtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
           orderNo: rtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
           needsolution: rtn.data.solutionContent,
           needsolution: rtn.data.solutionContent,
-          channelNeedNo: rtn.data.channelNeedNo,
+          channelNeedNo: rtn.data.channelNeedNo||"",
           channelSolutionNo: rtn.data.channelSolutionNo,
           channelSolutionNo: rtn.data.channelSolutionNo,
           servicer: {
           servicer: {
             code: 'gsb',
             code: 'gsb',