d

xgg-saas-merchant/app/base/api/impl/h5/merchantApi.js

@@ -26,9 +26,21 @@ class TestAPI extends APIBase {
         this.smsClient = system.getObject("util.smsClient");
     }
 
+    doMerchantId(obj) {
+        if (!obj.merchant_id) {
+            return;
+        }
+        try {
+            obj.merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
+        } catch (e) {
+            console.log(e);
+            return;
+        }
+    }
 
     //H5登录获取验证码
     async sendMobileCode(obj, obj1, req) {
+        this.doMerchantId(obj);
         let mobile = obj.mobile;
         if (!mobile) {
             return this.returnFail("请先填写手机号");
@@ -57,6 +69,7 @@ class TestAPI extends APIBase {
 
     // 登录接口 post
     async login(obj, obj1, req) {
+        this.doMerchantId(obj);
         try {
             if (!obj.mobile) {
                 return this.returnFail("请填写手机号");
@@ -77,7 +90,7 @@ class TestAPI extends APIBase {
             }
             let openID = "gtbh5_" + obj.mobile;
 
-            let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
+            let merchant_id = obj.merchant_id;
             let params = {
                 saas_merchant_id: merchant_id,
                 saas_id: null,
@@ -102,14 +115,16 @@ class TestAPI extends APIBase {
 
     //验证登录
     async loginUser(obj) {
+        this.doMerchantId(obj);
         // let merchant_id = decodeURIComponent(obj.merchant_id);
-        let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
-        let user = await this.getLoginUser(merchant_id, obj.openid);
+        // let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
+        let user = await this.getLoginUser(obj.merchant_id, obj.openid);
         return this.returnSuccess(user);
     }
 
 
     async uploadConfig(obj, obj1, req) {
+        this.doMerchantId(obj);
         try {
             let data = await this.uploadCtl.getOssConfig();
             return this.returnSuccess(data);
@@ -121,6 +136,8 @@ class TestAPI extends APIBase {
 
     // 保存订单信息
     async saveOrder(obj, obj1, req) {
+        this.doMerchantId(obj);
+
         try {
             // TODO this.loginUser();
             let loginUser = await this.loginUser(obj);
@@ -244,6 +261,7 @@ class TestAPI extends APIBase {
     }
 
     async myOrders(obj, obj1, req) {
+        this.doMerchantId(obj);
         // TODO this.loginUser();
         let loginUser = await this.loginUser(obj);
         if (!loginUser) {
@@ -285,6 +303,8 @@ class TestAPI extends APIBase {
      * @param {*} loginUser
      */
     async orderInfo(obj, obj1, req) {
+        this.doMerchantId(obj);
+
         // TODO this.loginUser();
 
         let loginUser = await this.loginUser(obj);
@@ -305,6 +325,8 @@ class TestAPI extends APIBase {
     }
 
     async idNoValid(obj, obj1, req) {
+        this.doMerchantId(obj);
+
         try {
             let idno = (obj.idno || "").trim();
             if (!idno) {
@@ -330,6 +352,8 @@ class TestAPI extends APIBase {
      * @returns {Promise<void>}
      */
     async saasorderbusinessmenPage(params, pobj2, req) {
+        this.doMerchantId(params);
+
         // TODO this.loginUser();
 
         let loginUser = await this.loginUser(params);
@@ -350,6 +374,8 @@ class TestAPI extends APIBase {
      * @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}>}
      */
     async saasTradeBusinessmenPage(obj, obj1, req) {
+        this.doMerchantId(obj);
+
         // TODO this.loginUser();
         let loginUser = await this.loginUser(obj);
         obj.merchant_app_user_id = loginUser.data.id;
@@ -390,6 +416,8 @@ class TestAPI extends APIBase {
      * @returns {Promise<void>}
      */
     async invoiceBycreditCode(obj, obj1, req) {
+        this.doMerchantId(obj);
+
         // TODO this.loginUser();
         let loginUser = await this.loginUser(obj);
         obj.merchant_app_user_id = loginUser.data.id;
@@ -432,6 +460,8 @@ class TestAPI extends APIBase {
      * @returns {Promise<void>}
      */
     async sendBankMobileCode(obj, obj1, req) {
+        this.doMerchantId(obj);
+
         // TODO this.loginUser();
         let loginUser = await this.loginUser(obj);
         let mobile = obj.mobile;