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

center-channel/app/base/api/impl/ic/tool.js

@@ -10,7 +10,7 @@ class Tool extends APIBase {
     }
     }
 
 
     async icname(params, req) {
     async icname(params, req) {
-        let url = settings.icNameUrl() + 'api/icName/CheckName';
+        let url = settings.icNameUrl() + 'openPlatform/ic/match';
         if (!params.cityName) {
         if (!params.cityName) {
             return system.getResult(-1, 'cityName 不能为空！');
             return system.getResult(-1, 'cityName 不能为空！');
         }
         }

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

@@ -444,12 +444,12 @@ class UtilsNeedService extends AppServiceBase {
     var rtn = await this.restPostUrl(pobj, url);
     var rtn = await this.restPostUrl(pobj, url);
     console.log("receiveIcpStatusNotify-->",rtn)
     console.log("receiveIcpStatusNotify-->",rtn)
     if (isTM){
     if (isTM){
-      if (actionBody.status == "0"|| actionBody.status =="23") {//付款状态,受理通知书推云服
+      /*if (actionBody.status == "0"|| actionBody.status =="23") {//付款状态,受理通知书推云服
          this.utilsPushSve.aliBusiness2Fq(pobj, "pushTMpaySuccess");
          this.utilsPushSve.aliBusiness2Fq(pobj, "pushTMpaySuccess");
       }
       }
       if (actionBody.status =="4" || actionBody.status =="22") {//付款失败状态,商标局不受理推云服
       if (actionBody.status =="4" || actionBody.status =="22") {//付款失败状态,商标局不受理推云服
          this.utilsPushSve.aliBusiness2Fq(pobj, "pushTMpayRefund");
          this.utilsPushSve.aliBusiness2Fq(pobj, "pushTMpayRefund");
-      }
+      }*/
       //通知fqboss
       //通知fqboss
       let pushres = await this.execPostUrl({ "actionProcess": "AliTm", "appCode": "100099", "sign": await this.getFQbossSign(actionBody), actionBody },settings.fqbossTmUrl())
       let pushres = await this.execPostUrl({ "actionProcess": "AliTm", "appCode": "100099", "sign": await this.getFQbossSign(actionBody), actionBody },settings.fqbossTmUrl())
       console.log("推送fqboos----->",pushres)
       console.log("推送fqboos----->",pushres)

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

@@ -771,7 +771,7 @@ class UtilsOrderService extends AppServiceBase {
   }
   }
   async orderClose(pobj) {//阿里退款
   async orderClose(pobj) {//阿里退款
     if (!pobj.actionBody.orderNo) {
     if (!pobj.actionBody.orderNo) {
-      return system.getResult(null, "actionBody.prderNo can not be empty");
+      return system.getResult(null, "actionBody.orderNo can not be empty");
     }
     }
     try {
     try {
       pobj.actionType = "channeldelOrder";
       pobj.actionType = "channeldelOrder";

center-channel/app/base/system.js

@@ -169,7 +169,10 @@ class System {
 		return {
 		return {
 			status: 0,
 			status: 0,
 			msg: okmsg,
 			msg: okmsg,
-			data: data || null,
+			data: data || "成功",
+			"code":"200",
+			"message":"成功",
+			"success":true
 		};
 		};
 	}
 	}
   // 2020 0916 lin 新增返回格式 成功status为1
   // 2020 0916 lin 新增返回格式 成功status为1

center-channel/app/config/settings.js

@@ -316,9 +316,9 @@ var settings = {
   },
   },
   icNameUrl: function () {
   icNameUrl: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
-      return "https://icname.gongsibao.com/"
+      return "https://fq.gongsibao.com/"
     } else {
     } else {
-      return "https://icname.gongsibao.com/"
+      return "https://fq.gongsibao.com/"
     }
     }
   },
   },
   apiconfig: {
   apiconfig: {

center-channel/app/front/entry/public/apidoc/README.md

@@ -54,7 +54,7 @@
 ## 16 公司起名相关接口
 ## 16 公司起名相关接口
 　　1 [公司起名相关接口](doc/api/platform/companyNaming.md)
 　　1 [公司起名相关接口](doc/api/platform/companyNaming.md)
 
 
-## 17. 商标驳回复审相关接口
+## 17. 商标驳回复审相关接口(弃用)
 　　1 [商标驳回复审相关接口](doc/api/platform/trademarkReview.md)
 　　1 [商标驳回复审相关接口](doc/api/platform/trademarkReview.md)
 
 
 ## 18. 资质诊断相关接口
 ## 18. 资质诊断相关接口