Merge branch 'igirl-channel-gateway' of gitlab.gongsibao.com:jiangyong/zhichan…

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

igirl-channel-gateway/app/base/controller/tm.springboard.js

@@ -12,7 +12,7 @@ class springboard {
         // this.setofbooksModel = CommSetofbooks.model();
         this.isAddPay = false;
         this.paymentids = [];
-        this.topic = require("../../utils").topic;
+        //this.topic = require("../../utils").topic;
     }
 
     /**

igirl-channel-gateway/app/base/service/app.base.js

@@ -10,7 +10,7 @@ class AppServiceBase {
   }
   /**
    * 验证签名
-   * @param {*} params 要验证的参数 
+   * @param {*} params 要验证的参数
    * @param {*} app_key 应用的校验key
    */
   async verifySign(params, app_key) {
@@ -98,5 +98,13 @@ class AppServiceBase {
     }
     return uuid.join('');
   }
+  getResult(uuid,msg){
+    return {
+      "requestId": uuid,
+      "success": !msg,
+      "errorMsg": msg||"",
+      "errorCode": "ok"
+    };
+  }
 }
 module.exports = AppServiceBase;

igirl-channel-gateway/app/base/service/impl/common/gatewaypushlogSve.js

@@ -279,9 +279,6 @@ class GatewaypushlogService extends ServiceBase {
         case "34":
           pobj.area = "海南";
           break;
-        default:
-          pobj.area = "";
-          break;
       }
     }
     if (!pobj.area) {

igirl-channel-gateway/app/config/routes/tm-springboard.js

@@ -4,6 +4,7 @@ const verify = require("../../base/utils/verify").Verify;
 const CtxBody = require("../../base/utils/CtxBody");
 const tmSpringboard = require("../../base/controller/tm.springboard");
 // var userCtl = system.getObject("web.auth.userCtl");
+const utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
 module.exports = function (app) {
 	app.post('/tm/springboard', async function(req, res) {
 		let body = req.body || {};
@@ -13,6 +14,16 @@ module.exports = function (app) {
 			verify.notNull(body.ActionType, 'ActionType 不能为空!');
 			verify.notNull(body.ActionBody, 'ActionBody 不能为空!');
 			let data = await _tmSpringboard.transferRequest();
+			if (body.ActionType === "SaveTradeMarkProductSolution") {//提交注册方案到阿里
+				body.ActionBody.BizId = data.BizId//TM_单号
+				body.ActionBody.needNo = body.ActionBody.IntentionBizId
+				//body.ActionBody.serviceOrderNo//云服单号
+				//body.ActionBody.IntentionBizId//needid需求号
+				body.ActionBody.bizId = body.ActionBody.IntentionBizId
+				let result = await utilsNeedSve.tmNotifyChannel(body.ActionBody)//通知启服通保存
+				if (!result.success)
+					return CtxBody.error(res, {});
+			}
 			CtxBody.success(res, data);
 			console.log("----返回成功");
 		} catch (error) {