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

center-channel/app/base/api/impl/tm/tmcase.js

@@ -10,26 +10,46 @@ class Tmcase extends APIBase {
     constructor() {
     constructor() {
         super();
         super();
         this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
         this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
-        this.baseUrl = settings.centerOrderUrl()+"/notifyaction/internalCallsNotify/"
+        this.baseUrl = settings.centerOrderUrl()+"notifyaction/opNeedSolution/"
     }
     }
 
 
     async updateTmStatus(pobj, qobj, req) {
     async updateTmStatus(pobj, qobj, req) {
         var reqUrl = this.baseUrl + "updateTmStatus";
         var reqUrl = this.baseUrl + "updateTmStatus";
-        var result = await this.utilsNeedSve.restPostUrl(pobj);
+        var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
         return result;
         return result;
     }
     }
     //接收辅助、担保商标注册信息
     //接收辅助、担保商标注册信息
     async nbtzreceiveAssistTmData(pobj, qobj, req) {
     async nbtzreceiveAssistTmData(pobj, qobj, req) {
         var reqUrl = this.baseUrl + "nbtzreceiveAssistTmData";
         var reqUrl = this.baseUrl + "nbtzreceiveAssistTmData";
-        var result = await this.utilsNeedSve.restPostUrl(pobj);
+        var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
+        if(result && result.status==0){
+            await this.pushData2Platform()
+        }
         return result;
         return result;
     }
     }
     //接收辅助、担保商标注册修改信息
     //接收辅助、担保商标注册修改信息
     async nbtzreceiveEditAssistTmData(pobj, qobj, req) {
     async nbtzreceiveEditAssistTmData(pobj, qobj, req) {
         var reqUrl = this.baseUrl + "nbtzreceiveEditAssistTmData";
         var reqUrl = this.baseUrl + "nbtzreceiveEditAssistTmData";
-        var result = await this.utilsNeedSve.restPostUrl(pobj);
+        var result = await this.utilsNeedSve.restPostUrl(pobj,reqUrl);
         return result;
         return result;
     }
     }
 
 
+    /**
+     * 推送数据至平台方（百度、阿里）
+     * needSolution 需求方案
+     * appInfo app
+     * opflag 操作标志：QueryTradeIntentionUserList：查询需求列表，SaveTradeMarkProductSolution：提交注册⽅案-商标信息
+     * SaveTradeMarkMaterialDetail：补全注册⽅案-申请⼈信息 ConfirmTradeIntention：确认注册⽅案
+     * 
+     */
+    async pushData2Platform(needSolution,appInfo,opflag){
+        if(appInfo.uapp_id==18){//阿里云商机
+
+        }
+        if(appInfo.uapp_id==44){//百度云商机
+            
+        }
+    }
+
 }
 }
 module.exports = Tmcase;
 module.exports = Tmcase;
\ No newline at end of file

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

@@ -803,9 +803,9 @@ class BaseCenterOrderService extends AppServiceBase {
           OfficialFileURL: res.data.OfficialFileURL,
           OfficialFileURL: res.data.OfficialFileURL,
           ApplicationStatus: res.data.ApplicationStatus,
           ApplicationStatus: res.data.ApplicationStatus,
           //2021-3-18 addNew
           //2021-3-18 addNew
-          CertificateNumber:ab.CertificateNumber || "",//证书编号
-          CertificateStartTime:ab.CertificateStartTime || "",//证书有效期 开始时间
-          CertificateEndTime:ab.CertificateEndTime || ""//证书有效期 结束时间
+          CertificateNumber:res.data.CertificateNumber || "",//证书编号
+          CertificateStartTime:res.data.CertificateStartTime || "",//证书有效期 开始时间
+          CertificateEndTime:res.data.CertificateEndTime || ""//证书有效期 结束时间
         };
         };
         //推送状态变更
         //推送状态变更
         var ali = await this.aliclient.reqbyget({ action: "AcceptPartnerNotification", reqbody: pushObj, apiVersion: "2019-05-08" });
         var ali = await this.aliclient.reqbyget({ action: "AcceptPartnerNotification", reqbody: pushObj, apiVersion: "2019-05-08" });

center-channel/app/config/businessConfig.js

@@ -48,7 +48,12 @@ module.exports = {
             "/api/ic/feedback/submit",
             "/api/ic/feedback/submit",
             "/api/ic/order/notify",
             "/api/ic/order/notify",
             "/api/ic/order/close",
             "/api/ic/order/close",
-            "/api/ic/tool/icname"
+            "/api/ic/tool/icname",
+            "/api/tm/consultation/submit",
+            "/api/tm/feedback/submit",
+            "/api/tm/status/notify",
+            "/api/tm/tmcase/nbtzreceiveAssistTmData",
+            "/api/tm/tmcase/nbtzreceiveEditAssistTmData"
         ]
         ]
     }
     }
 }
 }