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

center-channel/app/base/api/impl/opaction/tmReview.js

@@ -36,6 +36,15 @@ class tmReview extends WEBBase {
             case "receiveDeliveryData"://接收交付中心交付数据
                 opResult = await this.utilsDeliverSve.receiveDeliveryInfo(pobj,pobj.actionBody);
                 break;
+            case "composeDocAndDownload":
+                opResult = await this.utilsDeliverSve.composeDocAndDownload(pobj,pobj.actionBody);
+                break;
+            case "getPDFInfo":
+                opResult = await this.utilsDeliverSve.getPDFInfo(pobj,pobj.actionBody);
+                break;
+            case "addOfficial":
+                opResult = await this.utilsDeliverSve.addOfficial(pobj,pobj.actionBody);
+                break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;

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

@@ -203,15 +203,15 @@ class CenterorderService extends AppServiceBase {
   /**
    * 推送ICP交付信息至企业宝（交付系统）
    */
-  async pushIcpOrderDelivery2Qfb(orderNo, needsolution) {
-    var pushObj = {
-      orderNo: orderNo,
-      needsolution: needsolution.solutionContent
-    };
-    var url = this.qifubaoUrl + "xxx/xxxxx";
-    var rtn = await this.execClient.execPost(pushObj, url);
-    var data = JSON.parse(rtn.stdout);
-    return system.getResultSuccess(data);
+  async pushIcpOrderDelivery2Qfb(orderNo, needsolution,status) {
+    // var pushObj = {
+    //   orderNo: orderNo,
+    //   needsolution: needsolution.solutionContent
+    // };
+    // var url = this.qifubaoUrl + "xxx/xxxxx";
+    // var rtn = await this.execClient.execPost(pushObj, url);
+    // var data = JSON.parse(rtn.stdout);
+    // return system.getResultSuccess(data);
   }
 
   async icppaysuccess(pobj) {

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

@@ -5,9 +5,25 @@ class utilsDeliverSve extends AppServiceBase{
     constructor() {
         super();
         this.centerOrderUrl = settings.centerOrderUrl();
+        this.centerAppUrl = settings.centerAppUrl();
+        this.fileDealUrl = settings.fileDealUrl();
+        this.utilsDeliverSystemSve = system.getObject("service.utilsSve.utilsDeliverSystemSve")
     }
 
     /**
+     * 交付中心推送接口
+     * @param pobj
+     * @returns {Promise<*>}
+     */
+    async pushDeliver(pobj){
+        var verifyResult = await this.verifyParam(pobj);
+        pobj.actionBody = verifyResult.data;
+        var result = await this.utilsDeliverSystemSve.pushBusiness2DeliverSystem(pobj);
+        return result;
+    }
+
+
+    /**
      * 参数信息重组
      * @param pobj
      * @returns {Promise<{msg: *, data, status: number}>}
@@ -84,11 +100,35 @@ class utilsDeliverSve extends AppServiceBase{
             return await this.disposePushResultFail(pobj, verifyResult, "delivery->pushDelivery->verifyResult", "");
         }
         //修改交付信息
-        const url = this.centerOrderUrl +"action/tmreview/springBoard";
+        let url = this.centerOrderUrl +"action/tmreview/springBoard";
+
         let result = await this.restPostUrl(pobj, url);
         if(result.status !==0){
             return system.getResult(null,'更新失败')
         }
+        //获取订单
+        let orderUrl = this.centerOrderUrl + "action/order/springBoard";
+        pobj.actionType = "getOrderDetails"
+        let orderResult = await this.restPostUrl(pobj,orderUrl);
+        if(orderResult.status!=0){
+            return system.getResult(null,orderResult.msg);
+        }
+        //支付成功推送到交付中心
+        if(orderResult.data && orderResult.data.orderStatus === 2){
+            // 推送交付中心
+            pobj.actionBody = verifyResult.data;
+            let appUrl = this.centerAppUrl + 'action/opProduct/springBoard';
+            let params = {
+                actionType:"getAppInterface",
+                actionBody:pobj.actionBody
+            }
+            let reveResult = await this.restPostUrl(params,appUrl);
+            if(reveResult.status !=0){
+                return system.getResult(null,'获取接口数据失败');
+            }
+            pobj.interface_info = reveResult.data;
+            result = await this.utilsDeliverSystemSve.pushBusiness2DeliverSystem(pobj);
+        }
         return result;
     }
 
@@ -103,6 +143,17 @@ class utilsDeliverSve extends AppServiceBase{
         let result = await this.restPostUrl(pobj, url);
         return result;
     }
+    /**
+     * 接收官文信息
+     * @param pobj
+     * @param actionBody
+     * @returns {Promise<{msg: string, data, bizmsg: *|string, status: number}|any>}
+     */
+    async addOfficial(pobj,actionBody){
+        let url = this.centerOrderUrl + 'action/tmreview/springBoard';
+        let result = await this.restPostUrl(pobj, url);
+        return result;
+    }
 
     /**
      * 获取官文列表
@@ -130,6 +181,99 @@ class utilsDeliverSve extends AppServiceBase{
         }
         return result;
     }
+
+    /**
+     * 根据上传的驳回通知书，解析内容
+     * @param pobj
+     * @param actionBody
+     * @returns {Promise<{msg: string, data: (*|null), bizmsg: *, status: number}>}
+     */
+    async getPDFInfo(pobj,actionBody){
+        if(!actionBody.url){
+            return system.getResult(null,'url cant not be empty');
+        }
+        let url = this.fileDealUrl + "/gsb/tmreject";
+        let result = await this.restPostUrl(actionBody,url);
+        if(result.status !=1){
+            return system.getResult(null,'解析失败，稍后重试');
+        }
+        // "data": {
+        //     "address": "浙江省杭州市江干区太平门直街260号三新银座1521室",//通信地址
+        //     "applicant": "中艺联合文化产业有限公司",//申请人
+        //     "msg_number": "TMZC40902560BHTZ01"//发文号
+        // }
+        return system.getResult(result.data)
+    }
+
+    /**
+     * 合成模板并下载
+     * @param pobj
+     * @param actionBody
+     * @returns {Promise<void>}
+     */
+    async composeDocAndDownload(pobj,actionBody){
+        if(!actionBody.applicantName){
+            return system.getResult(null,'申请人为空');
+        }
+        if(!actionBody.askforId){
+            return system.getResult(null,'发文号为空');
+        }
+        if(!actionBody.addr){
+            return system.getResult(null,'通信地址为空');
+        }
+        if(!actionBody.dutyName){
+            return system.getResult(null,"负责人为空");
+        }
+        if(!actionBody.duty){
+            return system.getResult(null,"职务为空");
+        }
+        if(!actionBody.tradeType){
+            return system.getResult(null,"大类为空");
+        }
+        if(!actionBody.nclexist){
+            return system.getResult(null,"商品类别为空");
+        }
+        if(!actionBody.tradeImg){
+            return system.getResult(null,"商标图样为空");
+        }
+        if(!actionBody.isNeedSup){
+            return system.getResult(null,"补充材料判断为空");
+        }
+        if(!actionBody.docNo){
+            return system.getResult(null,"发文编号为空");
+        }
+        let secType='';
+        actionBody.nclexist.forEach(item=>{
+            secType += item.small_name +",";
+        })
+        secType = secType.substring(0,secType.length-1);
+        let server = '';
+        if(1<= +actionBody.tradeType <=34){
+            server = '商品';
+        }else if(35<= +actionBody.tradeType <=45){
+            server = '服务';
+        }
+        let data ={
+            applyUser:actionBody.applicantName,//申请人
+            addr:actionBody.addr,//通信地址
+            name:actionBody.dutyName,//主要负责人
+            duty:actionBody.duty,//职务
+            type:actionBody.tradeType,//商标大类
+            secType:secType,//商标二类
+            image:actionBody.tradeImg,//商标图样
+            num:actionBody.askforId,//申请号
+            docNo:actionBody.docNo,//发文号
+            select:actionBody.isNeedSup,//是否补充材料 是 否
+            server:server
+        }
+
+        let url = '';
+        let result = await this.restPostUrl(data,url);
+        if(result.status !=1){
+            return system.getResult(null,result.msg);
+        }
+        return system.getResult(result.data);
+    }
 }
 
 module.exports = utilsDeliverSve;
\ No newline at end of file

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

@@ -55,17 +55,7 @@ class UtilsNeedService extends AppServiceBase {
     return result;
   }
 
-  //调用center-order 
-  async reqCenterOrderApi(pobj, reqUrl) {
-    var url = this.centerOrderUrl + "action/icpapi/springBoard";
-    if (reqUrl) {
-      var url = this.centerOrderUrl + reqUrl;
-    }
-    pobj.actionType = "receiveIcpFeedback";
-    var rtn = await this.execClient.execPost(pobj, url);
-    var data = JSON.parse(rtn.stdout);
-    return data;
-  }
+
 
   //调用center-order  icp需求反馈
   async reqCenterOrderQcApi(pobj, reqUrl) {
@@ -119,17 +109,17 @@ class UtilsNeedService extends AppServiceBase {
     return result;
   }
 
-  //调用center-order  icp需求反馈
-  async reqCenterOrderApi(pobj, reqUrl) {
-    var url = this.centerOrderUrl + "action/icpapi/springBoard";
-    if (reqUrl) {
-      var url = this.centerOrderUrl + reqUrl;
-    }
-    pobj.actionType = "receiveIcpFeedback";
-    var rtn = await this.execClient.execPost(pobj, url);
-    var data = JSON.parse(rtn.stdout);
-    return data;
-  }
+  // //调用center-order  icp需求反馈
+  // async reqCenterOrderApi(pobj, reqUrl) {
+  //   var url = this.centerOrderUrl + "action/icpapi/springBoard";
+  //   if (reqUrl) {
+  //     var url = this.centerOrderUrl + reqUrl;
+  //   }
+  //   pobj.actionType = "receiveIcpFeedback";
+  //   var rtn = await this.execClient.execPost(pobj, url);
+  //   var data = JSON.parse(rtn.stdout);
+  //   return data;
+  // }
 
   /**
   * 获取需求详情

center-channel/app/config/routes/api.js

@@ -243,7 +243,7 @@ module.exports = function (app) {
 			"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
 			"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo",
             "getPaidLogoListByUser","getCollectibleLogoListByUser","collectLogo","getLogoMaterial","cancelCollectLogo","icpNotify","createName","getNameDetail","orderConfirm",
-            "orderTotalSum", "collect", "reg", "orderCheck","getReOrderList","getOfficalList"
+            "orderTotalSum", "collect", "reg", "orderCheck","getReOrderList","getOfficalList","addReviewList"
 		];
 		if (lst.indexOf(req.body.actionType) >= 0) {
 			var userpin = req.headers["userpin"] || "";

center-channel/app/config/settings.js

@@ -129,6 +129,13 @@ var settings = {
       return "http://specialprofile-service/"
     }
   },
+  fileDealUrl:function(){
+    if(this.env=='dev'){
+      return "http://43.247.184.92:15503";
+    }else{
+      return "http://43.247.184.92:15503"
+    }
+  },
   reqTransferurl: function () {
     if (this.env == "dev") {
       return "http://192.168.18.61:3003/";