Merge branch 'xgg-saas-merchant-h5' into xgg-saas-merchant

xgg-saas-merchant/app/base/api/api.base.js

@@ -9,6 +9,17 @@ class APIBase extends DocBase {
         this.cacheManager = system.getObject("db.common.cacheManager");
         this.logCtl = system.getObject("web.common.oplogCtl");
         this.oplogSve = system.getObject("service.common.oplogSve");
+        this.merchantappletuserSve = system.getObject("service.uc.merchantappletuserSve");
+
+    }
+
+    async getLoginUser(merchant_id, openid, forceUpdate) {
+        return await this.merchantappletuserSve.getLoginUser({merchant_id: merchant_id, openid: openid, forceUpdate: forceUpdate});
+    }
+
+
+    async getMerchant(merchant_id) {
+        return await this.merchantSve.getMerchantWithCache({id: merchant_id, forceUpdate: true});
     }
     getUUID() {
         var uuid = uuidv4();

xgg-saas-merchant/app/base/service/svems.base.js

@@ -220,7 +220,7 @@ class ServiceBase {
     }
     try {
       var params = {
-        "action_process": "xgg-saas-platform",
+        "action_process": "sijibao",
         "action_type": apiName,
         "action_body": params || {},
       }

xgg-saas-merchant/app/base/system.js

@@ -194,7 +194,7 @@ class System {
 				merchant: dev + ":3101" + path,
 
 				// 订单服务
-				order: local + ":3103" + path,
+				order: dev + ":3103" + path,
 
 				// 发票服务
 				invoice: dev + ":3105" + path,