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

xgg-saas-merchant/app/base/service/impl/saas/merchantSve.js

@@ -66,7 +66,7 @@ class MerchantService extends ServiceBase {
     if(!merchant || !merchant.id || params.forceUpdate) {
     if(!merchant || !merchant.id || params.forceUpdate) {
       let info = await this.info(params) || {};
       let info = await this.info(params) || {};
       merchant = info.data || {};
       merchant = info.data || {};
-      await this.redisClient.setWithEx(key, JSON.stringify(merchant), 60 * 31);
+      await this.redisClient.setWithEx(key, JSON.stringify(merchant), 60 * 5);
     } else {
     } else {
       merchant = JSON.parse(merchant);
       merchant = JSON.parse(merchant);
     }
     }
@@ -89,7 +89,7 @@ class MerchantService extends ServiceBase {
       let rs = await this.callms("merchant", "mchtSettings", {id: merchant_id}) || {};
       let rs = await this.callms("merchant", "mchtSettings", {id: merchant_id}) || {};
       settings = rs.data;
       settings = rs.data;
       if(settings && settings.appid && settings.secret) {
       if(settings && settings.appid && settings.secret) {
-        await this.redisClient.setWithEx(key, JSON.stringify(settings), 60 * 30);
+        await this.redisClient.setWithEx(key, JSON.stringify(settings), 60 * 5);
       }
       }
     } else {
     } else {
       settings = JSON.parse(settings);
       settings = JSON.parse(settings);

xgg-saas-merchant/app/base/wxapplet/impl/merchantApplet.js

@@ -118,6 +118,7 @@ class MerchantApplet extends AppletBase {
       let order = {
       let order = {
         saas_id: merchant.saas_id,
         saas_id: merchant.saas_id,
         merchant_id: merchant.id,
         merchant_id: merchant.id,
+        channel_id: merchant.channel_id,
         product_id: "10020000",
         product_id: "10020000",
         merchant_app_user_id: loginUser.id,
         merchant_app_user_id: loginUser.id,
         price: system.y2f(merchant.sign.bm_reg_price) || 0,
         price: system.y2f(merchant.sign.bm_reg_price) || 0,