saas模式，多商户支持修改

fuint-application/src/main/java/com/fuint/common/dto/ArticleDto.java

@@ -24,6 +24,11 @@ public class ArticleDto implements Serializable {
      */
     private String brief;
 
+    /**
+     * 所属商户
+     * */
+    private Integer merchantId;
+
     /**
      * 所属店铺
      * */
@@ -92,6 +97,12 @@ public class ArticleDto implements Serializable {
     public void setBrief(String brief){
         this.brief=brief;
     }
+    public Integer getMerchantId(){
+        return merchantId;
+    }
+    public void setMerchantId(Integer merchantId){
+        this.merchantId=merchantId;
+    }
     public Integer getStoreId(){
         return storeId;
     }

fuint-application/src/main/java/com/fuint/common/dto/OrderDto.java

@@ -84,6 +84,11 @@ public class OrderDto implements Serializable {
      */
     private Integer storeId;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
     /**
      * 员工ID
      */
@@ -284,6 +289,14 @@ public class OrderDto implements Serializable {
         this.storeId = storeId;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
     public Integer getStaffId() {
         return staffId;
     }

fuint-application/src/main/java/com/fuint/common/dto/RefundDto.java

@@ -22,6 +22,11 @@ public class RefundDto implements Serializable {
      */
     private Integer orderId;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
     /**
      * 店铺ID
      */
@@ -116,6 +121,14 @@ public class RefundDto implements Serializable {
         this.userId = userId;
     }
 
+    public Integer getMerchantId(){
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId){
+        this.merchantId=merchantId;
+    }
+
     public Integer getStoreId(){
         return storeId;
     }

fuint-application/src/main/java/com/fuint/common/dto/ReqCouponDto.java

@@ -16,6 +16,16 @@ public class ReqCouponDto implements Serializable {
      */
     private Integer id;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
+    /**
+     * 店铺ID
+     */
+    private Integer storeId;
+
     /**
      * 分组ID
      * */
@@ -107,7 +117,7 @@ public class ReqCouponDto implements Serializable {
      private String exceptTime;
 
     /**
-     * 店铺Id
+     * 适用店铺Id
      * */
     private String storeIds;
 
@@ -163,6 +173,20 @@ public class ReqCouponDto implements Serializable {
         this.id = id;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
     public Integer getGroupId() {
         return groupId;
     }

fuint-application/src/main/java/com/fuint/common/dto/ReqSendLogDto.java

@@ -16,6 +16,16 @@ public class ReqSendLogDto implements Serializable {
      * */
     private Integer id;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
+    /**
+     * 店铺ID
+     */
+    private Integer storeId;
+
     /**
      * 1：单用户发券；2：批量发券
      * */
@@ -89,6 +99,22 @@ public class ReqSendLogDto implements Serializable {
         this.id = id;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
+    public Integer getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
     public Integer getType() {
         return type;
     }

fuint-application/src/main/java/com/fuint/common/dto/UserOrderDto.java

@@ -19,6 +19,11 @@ public class UserOrderDto implements Serializable {
      */
     private Integer id;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
     /**
      * 订单号
      */
@@ -192,6 +197,14 @@ public class UserOrderDto implements Serializable {
         this.id = id;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
     public String getOrderSn() {
         return orderSn;
     }

fuint-application/src/main/java/com/fuint/common/param/ArticleListParam.java

@@ -15,4 +15,7 @@ public class ArticleListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="文章标题", name="title")
     private String title;
 
+    @ApiModelProperty(value="商户号", name="merchantNo")
+    private String merchantNo;
+
 }

fuint-application/src/main/java/com/fuint/common/param/GiveParam.java

@@ -27,6 +27,9 @@ public class GiveParam implements Serializable {
     @ApiModelProperty(value="转赠人ID", name="userId")
     private Integer userId;
 
+    @ApiModelProperty(value="商户ID", name="merchantId")
+    private Integer merchantId;
+
     @ApiModelProperty(value="店铺ID", name="storeId")
     private Integer storeId;
 

fuint-application/src/main/java/com/fuint/common/param/OrderListParam.java

@@ -18,6 +18,9 @@ public class OrderListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="会员ID", name="userId")
     private String userId;
 
+    @ApiModelProperty(value="商户ID", name="merchantId")
+    private Integer merchantId;
+
     @ApiModelProperty(value="店铺ID", name="storeId")
     private String storeId;
 

fuint-application/src/main/java/com/fuint/common/service/MerchantService.java

@@ -52,9 +52,17 @@ public interface MerchantService extends IService<MtMerchant> {
      * 根据商户号获取商户信息
      *
      * @param  merchantNo 商户号
-     * @throws BusinessCheckException
+     * @return
+     */
+    MtMerchant queryMerchantByNo(String merchantNo);
+
+    /**
+     * 根据商户号获取商户ID
+     *
+     * @param  merchantNo 商户号
+     * @return
      */
-    MtMerchant queryMerchantByNo(String merchantNo) throws BusinessCheckException;
+    Integer getMerchantId(String merchantNo);
 
     /**
      * 更新商户状态

fuint-application/src/main/java/com/fuint/common/service/OrderService.java

@@ -126,7 +126,7 @@ public interface OrderService extends IService<MtOrder> {
     /**
      * 计算购物车
      * */
-    Map<String, Object> calculateCartGoods(Integer userId, List<MtCart> cartList, Integer couponId, boolean isUsePoint, String platform, String orderMode) throws BusinessCheckException;
+    Map<String, Object> calculateCartGoods(Integer merchantId, Integer userId, List<MtCart> cartList, Integer couponId, boolean isUsePoint, String platform, String orderMode) throws BusinessCheckException;
 
     /**
      * 获取支付金额

fuint-application/src/main/java/com/fuint/common/service/SettingService.java

@@ -17,10 +17,11 @@ public interface SettingService extends IService<MtSetting> {
     /**
      * 删除配置
      *
+     * @param  merchantId
      * @param  name
      * @throws BusinessCheckException
      */
-    void removeSetting(String name) throws BusinessCheckException;
+    void removeSetting(Integer merchantId, String name) throws BusinessCheckException;
 
     /**
      * 保存配置
@@ -36,15 +37,16 @@ public interface SettingService extends IService<MtSetting> {
      * @param  type
      * @throws BusinessCheckException
      */
-    List<MtSetting> getSettingList(String type) throws BusinessCheckException;
+    List<MtSetting> getSettingList(Integer merchantId, String type) throws BusinessCheckException;
 
     /**
      * 根据配置名称获取配置信息
      *
+     * @param  merchantId
      * @param  name name
      * @throws BusinessCheckException
      */
-    MtSetting querySettingByName(String name) throws BusinessCheckException;
+    MtSetting querySettingByName(Integer merchantId, String name) throws BusinessCheckException;
 
     /**
      * 获取系统上传文件的根路径

fuint-application/src/main/java/com/fuint/common/service/WeixinService.java

@@ -34,7 +34,7 @@ public interface WeixinService {
 
     String getPhoneNumber(String encryptedData, String session_key, String iv);
 
-    Boolean sendSubscribeMessage(Integer userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException;
+    Boolean sendSubscribeMessage(Integer merchantId, Integer userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException;
 
     Boolean doSendSubscribeMessage(String reqDataJsonStr);
 

fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java

@@ -79,6 +79,10 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         if (StringUtils.isNotBlank(merchantId)) {
             lambdaQueryWrapper.eq(TAccount::getMerchantId, merchantId);
         }
+        String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
+        if (StringUtils.isNotBlank(storeId)) {
+            lambdaQueryWrapper.eq(TAccount::getStoreId, storeId);
+        }
 
         lambdaQueryWrapper.orderByDesc(TAccount::getAcctId);
         List<TAccount> accountList = tAccountMapper.selectList(lambdaQueryWrapper);
@@ -123,6 +127,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
             accountInfo.setRoleIds(account.getRoleIds());
             accountInfo.setStaffId(account.getStaffId());
             accountInfo.setStoreId(account.getStoreId());
+            accountInfo.setMerchantId(account.getMerchantId());
             return accountInfo;
         } else {
             return null;
@@ -150,6 +155,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         account.setRealName(tAccount.getRealName());
         account.setRoleIds(tAccount.getRoleIds());
         account.setStaffId(tAccount.getStaffId());
+        account.setMerchantId(tAccount.getMerchantId());
         account.setStoreId(tAccount.getStoreId());
         account.setCreateDate(new Date());
         account.setModifyDate(new Date());

fuint-application/src/main/java/com/fuint/common/service/impl/ArticleServiceImpl.java

@@ -3,10 +3,9 @@ package com.fuint.common.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import com.fuint.common.dto.ArticleDto;
 import com.fuint.common.service.ArticleService;
-import com.fuint.common.util.DateUtil;
+import com.fuint.common.service.MerchantService;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -15,7 +14,6 @@ import com.fuint.repository.mapper.MtArticleMapper;
 import com.fuint.repository.model.MtArticle;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.enums.StatusEnum;
-
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang.StringUtils;
 import com.github.pagehelper.Page;
@@ -42,6 +40,9 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
     @Resource
     private SettingService settingService;
 
+    @Resource
+    private MerchantService merchantService;
+
     /**
      * 分页查询文章列表
      *
@@ -62,11 +63,22 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtArticle::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtArticle::getMerchantId, merchantId);
+        }
+        String merchantNo = paginationRequest.getSearchParams().get("merchantNo") == null ? "" : paginationRequest.getSearchParams().get("merchantNo").toString();
+        Integer mchId = merchantService.getMerchantId(merchantNo);
+        if (mchId > 0) {
+            lambdaQueryWrapper.eq(MtArticle::getMerchantId, mchId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
-            lambdaQueryWrapper.eq(MtArticle::getStoreId, storeId);
+            lambdaQueryWrapper.and(wq -> wq
+                    .eq(MtArticle::getStoreId, 0)
+                    .or()
+                    .eq(MtArticle::getStoreId, storeId));
         }
-
         lambdaQueryWrapper.orderByAsc(MtArticle::getSort);
         List<MtArticle> articleList = mtArticleMapper.selectList(lambdaQueryWrapper);
         List<ArticleDto> dataList = new ArrayList<>();
@@ -101,6 +113,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         MtArticle mtArticle = new MtArticle();
         mtArticle.setTitle(articleDto.getTitle());
         mtArticle.setBrief(articleDto.getBrief());
+        mtArticle.setMerchantId(articleDto.getMerchantId());
         mtArticle.setStoreId(articleDto.getStoreId() == null ? 0 : articleDto.getStoreId());
         mtArticle.setUrl(articleDto.getUrl());
         mtArticle.setClick(0l);
@@ -111,6 +124,7 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         mtArticle.setUpdateTime(new Date());
         mtArticle.setCreateTime(new Date());
         mtArticle.setSort(articleDto.getSort());
+        mtArticle.setMerchantId(articleDto.getMerchantId());
         Integer id = mtArticleMapper.insert(mtArticle);
         if (id > 0) {
             return mtArticle;
@@ -173,6 +187,12 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         if (articleDto.getClick() != null) {
             mtArticle.setClick(articleDto.getClick());
         }
+        if (articleDto.getMerchantId() != null) {
+            mtArticle.setMerchantId(articleDto.getMerchantId());
+        }
+        if (articleDto.getMerchantId() != null) {
+            mtArticle.setMerchantId(articleDto.getMerchantId());
+        }
         if (articleDto.getStoreId() != null) {
             mtArticle.setStoreId(articleDto.getStoreId());
         }
@@ -201,8 +221,12 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         String status =  params.get("status") == null ? StatusEnum.ENABLED.getKey(): params.get("status").toString();
         String storeId =  params.get("storeId") == null ? "" : params.get("storeId").toString();
         String title = params.get("title") == null ? "" : params.get("title").toString();
+        String merchantId = params.get("merchantId") == null ? "" : params.get("merchantId").toString();
 
         LambdaQueryWrapper<MtArticle> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.like(MtArticle::getMerchantId, merchantId);
+        }
         if (StringUtils.isNotBlank(title)) {
             lambdaQueryWrapper.like(MtArticle::getTitle, title);
         }

fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java

@@ -85,11 +85,14 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         if (StringUtils.isNotBlank(mobile)) {
             lambdaQueryWrapper.eq(MtBalance::getMobile, mobile);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtBalance::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtBalance::getStoreId, storeId);
         }
-
         lambdaQueryWrapper.orderByDesc(MtBalance::getId);
         List<MtBalance> balanceList = mtBalanceMapper.selectList(lambdaQueryWrapper);
 
@@ -161,7 +164,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         params.put("amount", mtBalance.getAmount());
         params.put("time", dateTime);
         params.put("tips", "您的余额发生了变动，请留意~");
-        weixinService.sendSubscribeMessage(mtBalance.getUserId(), mtUser.getOpenId(), WxMessageEnum.BALANCE_CHANGE.getKey(), "pages/user/index", params, sendTime);
+        weixinService.sendSubscribeMessage(mtBalance.getMerchantId(), mtBalance.getUserId(), mtUser.getOpenId(), WxMessageEnum.BALANCE_CHANGE.getKey(), "pages/user/index", params, sendTime);
 
         return true;
     }

fuint-application/src/main/java/com/fuint/common/service/impl/CartServiceImpl.java

@@ -110,6 +110,7 @@ public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implement
             }
         }
 
+        mtCart.setMerchantId(reqDto.getMerchantId());
         mtCart.setStoreId(reqDto.getStoreId() == null ? 0 : reqDto.getStoreId());
         mtCart.setStatus(StatusEnum.ENABLED.getKey());
         mtCart.setUpdateTime(new Date());
@@ -208,6 +209,7 @@ public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implement
         String goodsId =  params.get("goodsId") == null ? "" : params.get("goodsId").toString();
         String skuId =  params.get("skuId") == null ? "" : params.get("skuId").toString();
         String storeId =  params.get("storeId") == null ? "" : params.get("storeId").toString();
+        String merchantId =  params.get("merchantId") == null ? "" : params.get("merchantId").toString();
 
         LambdaQueryWrapper<MtCart> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(MtCart::getStatus, status);
@@ -227,6 +229,9 @@ public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implement
         if (StringUtil.isNotEmpty(goodsId)) {
             lambdaQueryWrapper.eq(MtCart::getGoodsId, goodsId);
         }
+        if (StringUtil.isNotEmpty(merchantId) && Integer.parseInt(merchantId) > 0) {
+            lambdaQueryWrapper.eq(MtCart::getMerchantId, merchantId);
+        }
         if (StringUtil.isNotEmpty(storeId) && Integer.parseInt(storeId) > 0) {
             lambdaQueryWrapper.eq(MtCart::getStoreId, storeId);
         }

fuint-application/src/main/java/com/fuint/common/service/impl/ConfirmLogServiceImpl.java

@@ -70,6 +70,10 @@ public class ConfirmLogServiceImpl extends ServiceImpl<MtConfirmLogMapper, MtCon
         if (StringUtils.isNotBlank(couponId)) {
             lambdaQueryWrapper.eq(MtConfirmLog::getCouponId, couponId);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtConfirmLog::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtConfirmLog::getStoreId, storeId);

fuint-application/src/main/java/com/fuint/common/service/impl/CouponGroupServiceImpl.java

@@ -108,6 +108,14 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
         if (StringUtils.isNotBlank(id)) {
             lambdaQueryWrapper.eq(MtCouponGroup::getId, id);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtCouponGroup::getMerchantId, merchantId);
+        }
+        String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
+        if (StringUtils.isNotBlank(storeId)) {
+            lambdaQueryWrapper.eq(MtCouponGroup::getStoreId, storeId);
+        }
 
         lambdaQueryWrapper.orderByDesc(MtCouponGroup::getId);
         List<MtCouponGroup> dataList = mtCouponGroupMapper.selectList(lambdaQueryWrapper);

fuint-application/src/main/java/com/fuint/common/service/impl/CouponServiceImpl.java

@@ -109,6 +109,14 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
         if (StringUtils.isNotBlank(type)) {
             lambdaQueryWrapper.eq(MtCoupon::getType, type);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtCoupon::getMerchantId, merchantId);
+        }
+        String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
+        if (StringUtils.isNotBlank(storeId)) {
+            lambdaQueryWrapper.eq(MtCoupon::getStoreId, storeId);
+        }
 
         lambdaQueryWrapper.orderByDesc(MtCoupon::getId);
         List<MtCoupon> dataList = mtCouponMapper.selectList(lambdaQueryWrapper);
@@ -126,7 +134,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     /**
      * 保存卡券信息
      *
-     * @param reqCouponDto
+     * @param  reqCouponDto
      * @throws BusinessCheckException
      */
     @Override
@@ -146,7 +154,12 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
         if (endTime.before(startTime)) {
             throw new BusinessCheckException("生效期结束时间不能早于开始时间");
         }
-
+        if (reqCouponDto.getMerchantId() != null) {
+            mtCoupon.setMerchantId(reqCouponDto.getMerchantId());
+        }
+        if (reqCouponDto.getStoreId() != null) {
+            mtCoupon.setStoreId(reqCouponDto.getStoreId());
+        }
         mtCoupon.setGroupId(reqCouponDto.getGroupId());
         if (reqCouponDto.getType() != null) {
             mtCoupon.setType(reqCouponDto.getType());
@@ -289,6 +302,8 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
 
                 for (int i = 1; i <= total; i++) {
                     MtUserCoupon userCoupon = new MtUserCoupon();
+                    userCoupon.setMerchantId(mtCoupon.getMerchantId());
+                    userCoupon.setStoreId(mtCoupon.getStoreId());
                     userCoupon.setCouponId(couponInfo.getId());
                     userCoupon.setGroupId(mtCoupon.getGroupId());
                     userCoupon.setMobile("");
@@ -577,7 +592,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
             params.put("name", couponInfo.getName());
             params.put("amount", couponInfo.getAmount());
             params.put("tips", "您的卡券已到账，请查收~");
-            weixinService.sendSubscribeMessage(userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_ARRIVAL.getKey(), "pages/user/index", params, sendTime);
+            weixinService.sendSubscribeMessage(userInfo.getMerchantId(), userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_ARRIVAL.getKey(), "pages/user/index", params, sendTime);
         }
     }
 
@@ -692,6 +707,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
 
         // 生成核销流水
         MtConfirmLog confirmLog = new MtConfirmLog();
+        confirmLog.setMerchantId(couponInfo.getMerchantId());
         StringBuilder code = new StringBuilder();
         String sStoreId="00000"+storeId.toString();
         code.append(new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
@@ -743,7 +759,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
             String dateTime = DateUtil.formatDate(Calendar.getInstance().getTime(), "yyyy-MM-dd HH:mm");
             params.put("name", couponInfo.getName());
             params.put("time", dateTime);
-            weixinService.sendSubscribeMessage(userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_CONFIRM.getKey(), "pages/user/index", param, sendTime);
+            weixinService.sendSubscribeMessage(userInfo.getMerchantId(), userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_CONFIRM.getKey(), "pages/user/index", param, sendTime);
         } catch (Exception e) {
             //empty
         }

fuint-application/src/main/java/com/fuint/common/service/impl/GiveServiceImpl.java

@@ -80,6 +80,10 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtGive::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtGive::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtGive::getStoreId, storeId);
@@ -143,6 +147,7 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
         String message = giveParam.getMessage() == null ? "" : giveParam.getMessage();
         Integer userId = giveParam.getUserId() == null ? 0 : giveParam.getUserId();
         Integer storeId = giveParam.getStoreId() == null ? 0 : giveParam.getStoreId();
+        Integer merchantId = giveParam.getMerchantId() == null ? 0 : giveParam.getMerchantId();
 
         if (StringUtil.isEmpty(mobile) || mobile.length() > 11 || mobile.length() < 11) {
             throw new BusinessCheckException("转增对象手机号有误");
@@ -161,6 +166,7 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
         MtUser user = memberService.queryMemberByMobile(mobile);
         if (null == user) {
             MtUser userInfo = new MtUser();
+            userInfo.setMerchantId(merchantId);
             userInfo.setName(mobile);
             userInfo.setMobile(mobile);
             MtUserGrade grade = userGradeService.getInitUserGrade();
@@ -222,21 +228,19 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
         give.setMobile(mobile);
         give.setGiveUserId(userId);
         give.setUserId(user.getId());
+        give.setMerchantId(merchantId);
         give.setStoreId(storeId);
         give.setMoney(money);
         give.setNum(couponIds.length);
         give.setNote(note);
         give.setMessage(message);
         give.setUserMobile(myUser.getMobile());
-
         String couponIdsStr = StringUtil.join(couponIdList.toArray(), ",");
         give.setGroupIds(StringUtil.join(groupIds.toArray(), ","));
         give.setGroupNames(StringUtil.join(groupNames.toArray(), ","));
         give.setCouponIds(couponIdsStr);
         give.setCouponNames(StringUtil.join(couponNames.toArray(), ","));
-
         give.setStatus(StatusEnum.ENABLED.getKey());
-
         Date createTime = new Date();
         give.setCreateTime(createTime);
         give.setUpdateTime(createTime);

fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -88,6 +88,10 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
         if (StringUtils.isNotBlank(goodsNo)) {
             lambdaQueryWrapper.eq(MtGoods::getGoodsNo, goodsNo);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtGoods::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.and(wq -> wq
@@ -159,6 +163,9 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
         if (reqDto.getId() > 0) {
             mtGoods = queryGoodsById(reqDto.getId());
         }
+        if (reqDto.getMerchantId() != null) {
+            mtGoods.setMerchantId(reqDto.getMerchantId() >= 0 ? reqDto.getMerchantId() : 0);
+        }
         if (reqDto.getStoreId() != null) {
             mtGoods.setStoreId(reqDto.getStoreId() >= 0 ? reqDto.getStoreId() : 0);
         }

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -207,6 +207,10 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (StringUtils.isNotBlank(gradeId)) {
             lambdaQueryWrapper.eq(MtUser::getGradeId, gradeId);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtUser::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtUser::getStoreId, storeId);

fuint-application/src/main/java/com/fuint/common/service/impl/MerchantServiceImpl.java

@@ -155,13 +155,32 @@ public class MerchantServiceImpl extends ServiceImpl<MtMerchantMapper, MtMerchan
      * 根据商户号获取商户信息
      *
      * @param  merchantNo 商户号
-     * @throws BusinessCheckException
+     * @return
      */
     @Override
     public MtMerchant queryMerchantByNo(String merchantNo) {
         return mtMerchantMapper.queryMerchantByNo(merchantNo);
     }
 
+    /**
+     * 根据商户号获取商户ID
+     *
+     * @param  merchantNo 商户号
+     * @return
+     */
+    @Override
+    public Integer getMerchantId(String merchantNo) {
+       if (merchantNo == null || StringUtil.isEmpty(merchantNo)) {
+           return 0;
+       }
+       MtMerchant mtMerchant = queryMerchantByNo(merchantNo);
+       if (mtMerchant != null) {
+           return  mtMerchant.getId();
+       } else {
+           return 0;
+       }
+    }
+
     /**
      * 更新商户状态
      *

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -125,6 +125,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         Integer pageNumber = orderListParam.getPage() == null ? Constants.PAGE_NUMBER : orderListParam.getPage();
         Integer pageSize = orderListParam.getPageSize() == null ? Constants.PAGE_SIZE : orderListParam.getPageSize();
         String userId = orderListParam.getUserId() == null ? "" : orderListParam.getUserId();
+        Integer merchantId = orderListParam.getMerchantId() == null ? 0 : orderListParam.getMerchantId();
         String storeId = orderListParam.getStoreId() == null ? "" : orderListParam.getStoreId();
         String status =  orderListParam.getStatus() == null ? "": orderListParam.getStatus();
         String payStatus =  orderListParam.getPayStatus() == null ? "": orderListParam.getPayStatus();
@@ -171,6 +172,9 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         if (StringUtil.isNotEmpty(userId)) {
             lambdaQueryWrapper.eq(MtOrder::getUserId, userId);
         }
+        if (merchantId > 0) {
+            lambdaQueryWrapper.eq(MtOrder::getMerchantId, merchantId);
+        }
         if (StringUtil.isNotEmpty(storeId)) {
             lambdaQueryWrapper.eq(MtOrder::getStoreId, storeId);
         }
@@ -255,6 +259,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         }
 
         mtOrder.setUserId(orderDto.getUserId());
+        mtOrder.setMerchantId(orderDto.getMerchantId());
         mtOrder.setStoreId(orderDto.getStoreId());
         mtOrder.setCouponId(orderDto.getCouponId());
         mtOrder.setParam(orderDto.getParam());
@@ -345,7 +350,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             }
 
             boolean isUsePoint = orderDto.getUsePoint() > 0 ? true : false;
-            cartData = calculateCartGoods(orderDto.getUserId(), cartList, orderDto.getCouponId(), isUsePoint, orderDto.getPlatform(), orderInfo.getOrderMode());
+            cartData = calculateCartGoods(orderInfo.getMerchantId(), orderDto.getUserId(), cartList, orderDto.getCouponId(), isUsePoint, orderDto.getPlatform(), orderInfo.getOrderMode());
 
             mtOrder.setAmount(new BigDecimal(cartData.get("totalPrice").toString()));
             mtOrder.setUsePoint(Integer.parseInt(cartData.get("usePoint").toString()));
@@ -850,6 +855,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         UserOrderDto dto = new UserOrderDto();
 
         dto.setId(orderInfo.getId());
+        dto.setMerchantId(orderInfo.getMerchantId());
         dto.setUserId(orderInfo.getUserId());
         dto.setCouponId(orderInfo.getCouponId());
         dto.setOrderSn(orderInfo.getOrderSn());
@@ -1168,6 +1174,8 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
     /**
      * 计算商品总价
+     *
+     * @param merchantId
      * @param userId
      * @param cartList
      * @param couponId
@@ -1176,11 +1184,11 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
      * @return
      * */
     @Override
-    public Map<String, Object> calculateCartGoods(Integer userId, List<MtCart> cartList, Integer couponId, boolean isUsePoint, String platform, String orderMode) throws BusinessCheckException {
+    public Map<String, Object> calculateCartGoods(Integer merchantId, Integer userId, List<MtCart> cartList, Integer couponId, boolean isUsePoint, String platform, String orderMode) throws BusinessCheckException {
         MtUser userInfo = memberService.queryMemberById(userId);
 
         // 设置是否不能用积分抵扣
-        MtSetting pointSetting = settingService.querySettingByName(PointSettingEnum.CAN_USE_AS_MONEY.getKey());
+        MtSetting pointSetting = settingService.querySettingByName(merchantId, PointSettingEnum.CAN_USE_AS_MONEY.getKey());
         if (pointSetting != null && !pointSetting.getValue().equals("true")) {
             isUsePoint = false;
         }
@@ -1342,7 +1350,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         Integer myPoint = userInfo.getPoint() == null ? 0 : userInfo.getPoint();
         Integer usePoint = 0;
         BigDecimal usePointAmount = new BigDecimal("0");
-        MtSetting setting = settingService.querySettingByName(PointSettingEnum.EXCHANGE_NEED_POINT.getKey());
+        MtSetting setting = settingService.querySettingByName(merchantId, PointSettingEnum.EXCHANGE_NEED_POINT.getKey());
         if (myPoint > 0 && setting != null && isUsePoint) {
             if (StringUtil.isNotEmpty(setting.getValue()) && !setting.getValue().equals("0")) {
                 BigDecimal usePoints = new BigDecimal(myPoint);
@@ -1370,7 +1378,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
         // 配送费用
         BigDecimal deliveryFee = new BigDecimal("0");
-        MtSetting mtSetting = settingService.querySettingByName(OrderSettingEnum.DELIVERY_FEE.getKey());
+        MtSetting mtSetting = settingService.querySettingByName(merchantId, OrderSettingEnum.DELIVERY_FEE.getKey());
         if (mtSetting != null && StringUtil.isNotEmpty(mtSetting.getValue()) && orderMode.equals(OrderModeEnum.EXPRESS.getKey())) {
             deliveryFee = new BigDecimal(mtSetting.getValue());
         }

fuint-application/src/main/java/com/fuint/common/service/impl/PaymentServiceImpl.java

@@ -161,7 +161,7 @@ public class PaymentServiceImpl implements PaymentService {
         }
 
         // 处理消费返积分，查询返1积分所需消费金额
-        MtSetting setting = settingService.querySettingByName("pointNeedConsume");
+        MtSetting setting = settingService.querySettingByName(mtOrder.getMerchantId(), "pointNeedConsume");
         if (setting != null) {
             String needPayAmount = setting.getValue();
             Integer needPayAmountInt = Math.round(Integer.parseInt(needPayAmount));

fuint-application/src/main/java/com/fuint/common/service/impl/PointServiceImpl.java

@@ -156,7 +156,7 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         params.put("amount", mtPoint.getAmount());
         params.put("time", dateTime);
         params.put("remark", "您的积分发生了变动，请留意~");
-        weixinService.sendSubscribeMessage(mtPoint.getUserId(), mtUser.getOpenId(), WxMessageEnum.POINT_CHANGE.getKey(), "pages/user/index", params, sendTime);
+        weixinService.sendSubscribeMessage(mtPoint.getMerchantId(), mtPoint.getUserId(), mtUser.getOpenId(), WxMessageEnum.POINT_CHANGE.getKey(), "pages/user/index", params, sendTime);
 
         return;
     }

fuint-application/src/main/java/com/fuint/common/service/impl/RefundServiceImpl.java

@@ -234,6 +234,8 @@ public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> imp
         if (refundDto.getId() != null) {
             refund.setId(refund.getId());
         }
+        refund.setMerchantId(refundDto.getMerchantId());
+        refund.setStoreId(refundDto.getStoreId());
 
         // 检查是否已存在
         Map<String, Object> params = new HashMap<>();

fuint-application/src/main/java/com/fuint/common/service/impl/SendLogServiceImpl.java

@@ -54,6 +54,14 @@ public class SendLogServiceImpl extends ServiceImpl<MtSendLogMapper, MtSendLog>
         if (StringUtils.isNotBlank(userId)) {
             lambdaQueryWrapper.eq(MtSendLog::getUserId, userId);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtSendLog::getMerchantId, merchantId);
+        }
+        String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
+        if (StringUtils.isNotBlank(storeId)) {
+            lambdaQueryWrapper.eq(MtSendLog::getStoreId, storeId);
+        }
         String couponId = paginationRequest.getSearchParams().get("couponId") == null ? "" : paginationRequest.getSearchParams().get("couponId").toString();
         if (StringUtils.isNotBlank(couponId)) {
             lambdaQueryWrapper.eq(MtSendLog::getCouponId, couponId);
@@ -85,7 +93,8 @@ public class SendLogServiceImpl extends ServiceImpl<MtSendLogMapper, MtSendLog>
     @Override
     public MtSendLog addSendLog(ReqSendLogDto reqSendLogDto) {
         MtSendLog mtLog = new MtSendLog();
-
+        mtLog.setMerchantId(reqSendLogDto.getMerchantId());
+        mtLog.setStoreId(reqSendLogDto.getStoreId());
         mtLog.setType(reqSendLogDto.getType());
         mtLog.setUserId(reqSendLogDto.getUserId());
         mtLog.setFileName(reqSendLogDto.getFileName());
@@ -101,9 +110,7 @@ public class SendLogServiceImpl extends ServiceImpl<MtSendLogMapper, MtSendLog>
         mtLog.setCreateTime(new Date());
         mtLog.setOperator(reqSendLogDto.getOperator());
         mtLog.setUuid(reqSendLogDto.getUuid());
-
         mtSendLogMapper.insert(mtLog);
-
         return mtLog;
     }
 

fuint-application/src/main/java/com/fuint/common/service/impl/SettingServiceImpl.java

@@ -39,13 +39,14 @@ public class SettingServiceImpl extends ServiceImpl<MtSettingMapper, MtSetting>
     /**
      * 删除配置
      *
+     * @param  merchantId
      * @param  name
      * @throws BusinessCheckException
      */
     @Override
     @OperationServiceLog(description = "删除配置信息")
-    public void removeSetting(String name) {
-        MtSetting info = querySettingByName(name);
+    public void removeSetting(Integer merchantId, String name) {
+        MtSetting info = querySettingByName(merchantId, name);
         if (info != null) {
             mtSettingMapper.deleteById(info.getId());
         }
@@ -55,14 +56,14 @@ public class SettingServiceImpl extends ServiceImpl<MtSettingMapper, MtSetting>
     /**
      * 保存配置
      *
-     * @param mtSetting
+     * @param  mtSetting
      * @throws BusinessCheckException
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "保存配置信息")
     public MtSetting saveSetting(MtSetting mtSetting) {
-        MtSetting info = querySettingByName(mtSetting.getName());
+        MtSetting info = querySettingByName(mtSetting.getMerchantId(), mtSetting.getName());
         if (null != info) {
             if (mtSetting.getValue() != null) {
                 info.setValue(mtSetting.getValue());
@@ -96,24 +97,26 @@ public class SettingServiceImpl extends ServiceImpl<MtSettingMapper, MtSetting>
     /**
      * 获取配置列表
      *
+     * @param  merchantId
      * @param  type
      * @throws BusinessCheckException
      */
     @Override
-    public List<MtSetting> getSettingList(String type) {
-        List<MtSetting> dataList = mtSettingMapper.querySettingByType(type);
+    public List<MtSetting> getSettingList(Integer merchantId, String type) {
+        List<MtSetting> dataList = mtSettingMapper.querySettingByType(merchantId, type);
         return dataList;
     }
 
     /**
      * 根据ID获取配置信息
      *
+     * @param  merchantId
      * @param  name
      * @throws BusinessCheckException
      */
     @Override
-    public MtSetting querySettingByName(String name) {
-        return mtSettingMapper.querySettingByName(name);
+    public MtSetting querySettingByName(Integer merchantId, String name) {
+        return mtSettingMapper.querySettingByName(merchantId, name);
     }
 
     /**

fuint-application/src/main/java/com/fuint/common/service/impl/SettlementServiceImpl.java

@@ -94,6 +94,12 @@ public class SettlementServiceImpl implements SettlementService {
     @Autowired
     private PaymentService paymentService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 订单结算
      * @return
@@ -125,7 +131,8 @@ public class SettlementServiceImpl implements SettlementService {
         String orderMode = param.getOrderMode()== null ? OrderModeEnum.ONESELF.getKey() : param.getOrderMode(); // 订单模式(配送or自取)
         Integer orderId = param.getOrderId() == null ? null : param.getOrderId(); // 订单ID
 
-        MtSetting config = settingService.querySettingByName(OrderSettingEnum.IS_CLOSE.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        MtSetting config = settingService.querySettingByName(merchantId, OrderSettingEnum.IS_CLOSE.getKey());
         if (config != null && config.getValue().equals("true")) {
             throw new BusinessCheckException("系统已关闭交易功能，请稍后再试！");
         }
@@ -209,6 +216,7 @@ public class SettlementServiceImpl implements SettlementService {
         orderDto.setId(orderId);
         orderDto.setRemark(remark);
         orderDto.setUserId(userId);
+        orderDto.setMerchantId(merchantId);
         orderDto.setStoreId(storeId);
         orderDto.setType(type);
         orderDto.setGoodsId(goodsId);
@@ -222,7 +230,7 @@ public class SettlementServiceImpl implements SettlementService {
         orderDto.setIsVisitor(isVisitor);
         orderDto.setPlatform(platform);
 
-        MtSetting pointSetting = settingService.querySettingByName(PointSettingEnum.CAN_USE_AS_MONEY.getKey());
+        MtSetting pointSetting = settingService.querySettingByName(merchantId, PointSettingEnum.CAN_USE_AS_MONEY.getKey());
         // 使用积分数量
         if (pointSetting != null && pointSetting.getValue().equals("true")) {
             orderDto.setUsePoint(usePoint);
@@ -289,7 +297,7 @@ public class SettlementServiceImpl implements SettlementService {
 
         // 商品订单且配送要加上配送费用
         if (orderDto.getType().equals(OrderTypeEnum.GOOGS.getKey()) && orderDto.getOrderMode().equals(OrderModeEnum.EXPRESS.getKey())) {
-            MtSetting mtSetting = settingService.querySettingByName(OrderSettingEnum.DELIVERY_FEE.getKey());
+            MtSetting mtSetting = settingService.querySettingByName(merchantId, OrderSettingEnum.DELIVERY_FEE.getKey());
             if (mtSetting != null && StringUtil.isNotEmpty(mtSetting.getValue())) {
                 BigDecimal deliveryFee = new BigDecimal(mtSetting.getValue());
                 if (deliveryFee.compareTo(new BigDecimal("0")) > 0) {
@@ -300,7 +308,7 @@ public class SettlementServiceImpl implements SettlementService {
 
         // 使用积分抵扣
         if (usePoint > 0) {
-            List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.POINT.getKey());
+            List<MtSetting> settingList = settingService.getSettingList(merchantId, SettingTypeEnum.POINT.getKey());
             String canUsedAsMoney = "false";
             String exchangeNeedPoint = "0";
             for (MtSetting setting : settingList) {
@@ -485,7 +493,7 @@ public class SettlementServiceImpl implements SettlementService {
         params.put("time", dateTime);
         params.put("orderSn", orderInfo.getOrderSn());
         params.put("remark", "您的订单已生成，请留意~");
-        weixinService.sendSubscribeMessage(userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.ORDER_CREATED.getKey(), "pages/order/index", params, sendTime);
+        weixinService.sendSubscribeMessage(merchantId, userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.ORDER_CREATED.getKey(), "pages/order/index", params, sendTime);
 
         if (StringUtil.isNotEmpty(errorMessage)) {
             throw new BusinessCheckException(errorMessage);

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -335,12 +335,12 @@ public class WeixinServiceImpl implements WeixinService {
      * @return
      * */
     @Override
-    public Boolean sendSubscribeMessage(Integer userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException {
+    public Boolean sendSubscribeMessage(Integer merchantId, Integer userId, String toUserOpenId, String key, String page, Map<String,Object> params, Date sendTime) throws BusinessCheckException {
         if (StringUtil.isEmpty(toUserOpenId) || StringUtil.isEmpty(key) || userId < 1) {
             return false;
         }
 
-        MtSetting mtSetting = settingService.querySettingByName(key);
+        MtSetting mtSetting = settingService.querySettingByName(merchantId, key);
         if (mtSetting == null) {
             return false;
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendAccountController.java

@@ -107,6 +107,9 @@ public class BackendAccountController extends BaseController {
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             searchParams.put("merchantId", accountInfo.getMerchantId());
         }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            searchParams.put("storeId", accountInfo.getStoreId());
+        }
 
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<AccountDto> paginationResponse = tAccountService.getAccountListByPagination(paginationRequest);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendActionLogController.java

@@ -1,7 +1,9 @@
 package com.fuint.module.backendApi.controller;
 
 import com.fuint.common.Constants;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.service.ActionLogService;
+import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.framework.web.BaseController;
@@ -40,6 +42,7 @@ public class BackendActionLogController extends BaseController {
     @ApiOperation(value = "操作日志列表")
     @RequestMapping(value = "/list")
     public ResponseObject list(HttpServletRequest request) {
+        String token = request.getHeader("Access-Token");
         Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
         String accountName = request.getParameter("accountName") == null ? "" : request.getParameter("accountName");
@@ -48,6 +51,11 @@ public class BackendActionLogController extends BaseController {
         String beginTime = request.getParameter("params[beginTime]") == null ? "" : request.getParameter("params[beginTime]");
         String endTime = request.getParameter("params[endTime]") == null ? "" : request.getParameter("params[endTime]");
 
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
         paginationRequest.setPageSize(pageSize);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendArticleController.java

@@ -57,7 +57,7 @@ public class BackendArticleController extends BaseController {
     /**
      * 文章列表查询
      *
-     * @param  request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return 文章列表
      */
     @ApiOperation(value = "文章列表查询")
@@ -96,6 +96,9 @@ public class BackendArticleController extends BaseController {
         if (storeId != null && storeId > 0) {
             params.put("storeId", storeId);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
         paginationRequest.setSearchParams(params);
         PaginationResponse<ArticleDto> paginationResponse = articleService.queryArticleListByPagination(paginationRequest);
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java

@@ -25,7 +25,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
@@ -62,7 +61,7 @@ public class BackendBalanceController extends BaseController {
     /**
      * 余额明细列表查询
      *
-     * @param  request HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return 余额明细列表
      */
     @ApiOperation(value = "余额明细列表查询")
@@ -98,6 +97,9 @@ public class BackendBalanceController extends BaseController {
         if (storeId != null && storeId > 0) {
             searchParams.put("storeId", storeId);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -179,7 +181,7 @@ public class BackendBalanceController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.BALANCE.getKey());
+        List<MtSetting> settingList = settingService.getSettingList(accountInfo.getMerchantId(), SettingTypeEnum.BALANCE.getKey());
 
         List<RechargeRuleDto> rechargeRuleList = new ArrayList<>();
         String remark = "";

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCashierController.java

@@ -379,7 +379,7 @@ public class BackendCashierController extends BaseController {
              if (cartList.size() > 0) {
                  Integer userId = cartList.get(0).getUserId();
                  String isVisitor = cartList.get(0).getIsVisitor();
-                 Map<String, Object> cartInfo = orderService.calculateCartGoods(userId, cartList, 0, false, PlatformTypeEnum.PC.getCode(), OrderModeEnum.ONESELF.getKey());
+                 Map<String, Object> cartInfo = orderService.calculateCartGoods(accountInfo.getMerchantId(), userId, cartList, 0, false, PlatformTypeEnum.PC.getCode(), OrderModeEnum.ONESELF.getKey());
                  dto.setNum(Integer.parseInt(cartInfo.get("totalNum").toString()));
                  dto.setAmount(new BigDecimal(cartInfo.get("totalPrice").toString()));
                  if (isVisitor.equals(YesOrNoEnum.NO.getKey())) {

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCateController.java

@@ -107,6 +107,9 @@ public class BackendCateController extends BaseController {
         if (storeId > 0) {
             params.put("storeId", storeId);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
 
         paginationRequest.setSearchParams(params);
         paginationRequest.setSortColumn(new String[]{"sort asc", "status asc"});
@@ -173,7 +176,7 @@ public class BackendCateController extends BaseController {
     /**
      * 保存商品分类
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      */
     @ApiOperation(value = "保存商品分类")
@@ -204,6 +207,7 @@ public class BackendCateController extends BaseController {
         info.setLogo(logo);
         info.setSort(Integer.parseInt(sort));
         info.setStatus(status);
+        info.setMerchantId(accountDto.getMerchantId());
         info.setStoreId(storeId);
         String operator = accountDto.getAccountName();
         info.setOperator(operator);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendConfirmLogController.java

@@ -81,6 +81,7 @@ public class BackendConfirmLogController extends BaseController {
         String userId = request.getParameter("userId") == null ? "" : request.getParameter("userId");
         String mobile = request.getParameter("mobile") == null ? "" : request.getParameter("mobile");
         String couponId = request.getParameter("couponId") == null ? "" : request.getParameter("couponId");
+        String merchantId = request.getParameter("merchantId") == null ? "" : request.getParameter("merchantId");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
@@ -92,18 +93,18 @@ public class BackendConfirmLogController extends BaseController {
         paginationRequest.setPageSize(pageSize);
 
         Map<String, Object> searchParams = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(status)) {
             searchParams.put("status", status);
         }
-
         if (StringUtil.isNotEmpty(userId)) {
             searchParams.put("userId", userId);
         }
-
         if (StringUtil.isNotEmpty(couponId)) {
             searchParams.put("couponId", couponId);
         }
-
         if (StringUtil.isNotEmpty(mobile)) {
             MtUser userInfo = memberService.queryMemberByMobile(mobile);
             if (userInfo != null) {
@@ -151,7 +152,7 @@ public class BackendConfirmLogController extends BaseController {
     @ApiOperation(value = "撤销已使用的卡券")
     @RequestMapping(value = "/rollbackUserCoupon/{id}", method = RequestMethod.GET)
     @CrossOrigin
-    public ResponseObject rollbackUserCoupon(HttpServletRequest request, @PathVariable("id") Integer id) throws BusinessCheckException {
+    public ResponseObject rollbackUserCoupon(HttpServletRequest request, @PathVariable("id") Integer id) {
         String token = request.getHeader("Access-Token");
         String userCouponId = (request.getParameter("userCouponId") == null || StringUtil.isEmpty(request.getParameter("userCouponId"))) ? "0" : request.getParameter("userCouponId");
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponController.java

@@ -21,7 +21,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -88,7 +87,7 @@ public class BackendCouponController extends BaseController {
     /**
      * 查询卡券列表
      *
-     * @param request
+     * @param  request
      * @return
      * @throws BusinessCheckException
      */
@@ -115,6 +114,12 @@ public class BackendCouponController extends BaseController {
         paginationRequest.setPageSize(pageSize);
 
         Map<String, Object> params = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            params.put("storeId", accountInfo.getStoreId());
+        }
         if (groupId > 0) {
             params.put("groupId", groupId.toString());
         }
@@ -130,6 +135,12 @@ public class BackendCouponController extends BaseController {
         if (StringUtil.isNotEmpty(status)) {
             params.put("status", status);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            params.put("storeId", accountInfo.getStoreId());
+        }
 
         paginationRequest.setSearchParams(params);
         paginationRequest.setSortColumn(new String[]{"status asc", "createTime desc"});
@@ -258,7 +269,7 @@ public class BackendCouponController extends BaseController {
     /**
      * 保存卡券
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      */
     @ApiOperation(value = "保存卡券")
@@ -288,9 +299,11 @@ public class BackendCouponController extends BaseController {
         }
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
-        Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();
-        if (storeId > 0) {
-            reqCouponDto.setStoreIds(storeId.toString());
+        if (account.getStoreId() != null && account.getStoreId() > 0) {
+            reqCouponDto.setStoreId(account.getStoreId());
+        }
+        if (account.getMerchantId() != null && account.getMerchantId() > 0) {
+            reqCouponDto.setMerchantId(account.getMerchantId());
         }
 
         try {
@@ -464,6 +477,8 @@ public class BackendCouponController extends BaseController {
         String operator = accountInfo.getAccountName();
         dto.setOperator(operator);
         dto.setUuid(uuid);
+        dto.setMerchantId(accountInfo.getMerchantId());
+        dto.setStoreId(accountInfo.getStoreId());
         sendLogService.addSendLog(dto);
 
         // 发送短信

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCouponGroupController.java

@@ -65,6 +65,9 @@ public class BackendCouponGroupController extends BaseController {
     @Autowired
     CouponService couponService;
 
+    /**
+     * 导出服务接口
+     * */
     @Autowired
     private ExportService exportService;
 
@@ -79,12 +82,18 @@ public class BackendCouponGroupController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
         Integer page = request.getParameter("page") == null ? 1 : Integer.parseInt(request.getParameter("page"));
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
         String name = request.getParameter("name") == null ? "" : request.getParameter("name");
         String id = request.getParameter("id") == null ? "" : request.getParameter("id");
         String status = request.getParameter("status") == null ? StatusEnum.ENABLED.getKey() : request.getParameter("status");
 
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
         paginationRequest.setPageSize(pageSize);
@@ -99,6 +108,12 @@ public class BackendCouponGroupController extends BaseController {
         if (StringUtil.isNotEmpty(status)) {
             searchParams.put("status", status);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            searchParams.put("storeId", accountInfo.getStoreId());
+        }
 
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<MtCouponGroup> paginationResponse = couponGroupService.queryCouponGroupListByPagination(paginationRequest);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGiveLogController.java

@@ -110,6 +110,9 @@ public class BackendGiveLogController extends BaseController {
         if (storeId > 0) {
             params.put("storeId", storeId);
         }
+        if (account.getMerchantId() != null && account.getMerchantId() > 0) {
+            params.put("merchantId", account.getMerchantId());
+        }
         paginationRequest.setSearchParams(params);
         PaginationResponse<GiveDto> paginationResponse = giveService.queryGiveListByPagination(paginationRequest);
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -105,6 +105,7 @@ public class BackendGoodsController extends BaseController {
 
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();
+        Integer merchantId = account.getMerchantId() == null ? 0 : account.getMerchantId();
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -114,6 +115,9 @@ public class BackendGoodsController extends BaseController {
         if (StringUtil.isNotEmpty(searchStoreId)) {
             params.put("storeId", searchStoreId);
         }
+        if (merchantId > 0) {
+            params.put("merchantId", merchantId);
+        }
         if (storeId > 0) {
             params.put("storeId", storeId);
         }
@@ -496,6 +500,7 @@ public class BackendGoodsController extends BaseController {
 
         MtGoods info = new MtGoods();
         info.setId(Integer.parseInt(goodsId));
+        info.setMerchantId(accountInfo.getMerchantId());
         if (StringUtil.isNotEmpty(type)) {
             info.setType(type);
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -125,6 +125,9 @@ public class BackendMemberController extends BaseController {
         if (storeId > 0) {
             params.put("storeId", storeId.toString());
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(startTime)) {
             params.put("startTime", startTime);
         }
@@ -331,7 +334,7 @@ public class BackendMemberController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.USER.getKey());
+        List<MtSetting> settingList = settingService.getSettingList(accountInfo.getMerchantId(), SettingTypeEnum.USER.getKey());
 
         String getCouponNeedPhone = "false";
         String submitOrderNeedPhone = "false";
@@ -394,6 +397,8 @@ public class BackendMemberController extends BaseController {
             info.setDescription(setting.getValue());
             info.setOperator(operator);
             info.setUpdateTime(new Date());
+            info.setMerchantId(accountInfo.getMerchantId());
+            info.setStoreId(accountInfo.getStoreId());
 
             settingService.saveSetting(info);
         }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java

@@ -90,6 +90,9 @@ public class BackendOrderController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
+        if (account.getMerchantId() != null && account.getMerchantId() > 0) {
+            orderListParam.setMerchantId(account.getMerchantId());
+        }
         Integer storeId = account.getStoreId() == null ? 0 : account.getStoreId();
         if (storeId > 0) {
             orderListParam.setStoreId(storeId.toString());
@@ -270,7 +273,7 @@ public class BackendOrderController extends BaseController {
             params.put("orderSn", orderInfo.getOrderSn());
             params.put("expressCompany", expressCompany);
             params.put("expressNo", expressNo);
-            weixinService.sendSubscribeMessage(userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.DELIVER_GOODS.getKey(), "pages/order/index", params, sendTime);
+            weixinService.sendSubscribeMessage(userInfo.getMerchantId(), userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.DELIVER_GOODS.getKey(), "pages/order/index", params, sendTime);
         }
 
         return getSuccessResult(true);
@@ -445,7 +448,7 @@ public class BackendOrderController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.ORDER.getKey());
+        List<MtSetting> settingList = settingService.getSettingList(accountInfo.getMerchantId(), SettingTypeEnum.ORDER.getKey());
         Map<String, Object> result = new HashMap();
         String deliveryFee = "";
         String isClose = "";
@@ -496,7 +499,8 @@ public class BackendOrderController extends BaseController {
             } else if (setting.getKey().equals("isClose")) {
                 info.setValue(isClose);
             }
-
+            info.setMerchantId(accountInfo.getMerchantId());
+            info.setStoreId(accountInfo.getStoreId());
             info.setDescription(setting.getValue());
             info.setStatus(StatusEnum.ENABLED.getKey());
             info.setOperator(operator);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendPointController.java

@@ -63,7 +63,7 @@ public class BackendPointController extends BaseController {
     /**
      * 积分明细列表查询
      *
-     * @param  request HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return 积分明细列表
      */
     @ApiOperation(value = "积分明细列表查询")
@@ -102,6 +102,11 @@ public class BackendPointController extends BaseController {
             searchParams.put("status", status);
         }
 
+        Integer merchantId = accountInfo.getMerchantId();
+        if (merchantId != null && merchantId > 0) {
+            searchParams.put("merchantId", merchantId);
+        }
+
         Integer storeId = accountInfo.getStoreId();
         if (storeId != null && storeId > 0) {
             searchParams.put("storeId", storeId);
@@ -132,7 +137,7 @@ public class BackendPointController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.POINT.getKey());
+        List<MtSetting> settingList = settingService.getSettingList(accountInfo.getMerchantId(), SettingTypeEnum.POINT.getKey());
         Map<String, Object> result = new HashMap();
         String pointNeedConsume = "";
         String canUsedAsMoney = "";

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendSubMessageController.java

@@ -65,7 +65,7 @@ public class BackendSubMessageController extends BaseController {
         List<SubMessageDto> dataList = new ArrayList<>();
         for (WxMessageEnum wxMessageEnum : WxMessageEnum.values()) {
             SubMessageDto e = new SubMessageDto();
-            MtSetting setting = settingService.querySettingByName(wxMessageEnum.getKey());
+            MtSetting setting = settingService.querySettingByName(accountInfo.getMerchantId(), wxMessageEnum.getKey());
             e.setKey(wxMessageEnum.getKey());
             e.setTitle(wxMessageEnum.getValue());
             JSONObject jsonObject = null;
@@ -130,7 +130,7 @@ public class BackendSubMessageController extends BaseController {
 
         String name = WxMessageEnum.getValue(key);
         if (StringUtil.isNotEmpty(name)) {
-            MtSetting mtSetting = settingService.querySettingByName(key);
+            MtSetting mtSetting = settingService.querySettingByName(accountInfo.getMerchantId(), key);
             JSONObject jsonObject = null;
             try {
                 if (mtSetting != null && mtSetting.getValue().indexOf('}') > 0) {
@@ -241,8 +241,8 @@ public class BackendSubMessageController extends BaseController {
             subMessageDto.setParams(params);
             String json = JSONObject.toJSONString(subMessageDto);
 
-            // 保存
-            settingService.removeSetting(key);
+            // 保存配置
+            settingService.removeSetting(accountInfo.getMerchantId(), key);
             MtSetting info = new MtSetting();
             info.setType(SettingTypeEnum.SUB_MESSAGE.getKey());
             info.setName(key);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientArticleController.java

@@ -53,6 +53,7 @@ public class ClientArticleController extends BaseController {
         String title = articleListParam.getTitle();
         Integer page = articleListParam.getPage() == null ? Constants.PAGE_NUMBER : articleListParam.getPage();
         Integer pageSize = articleListParam.getPageSize() == null ? Constants.PAGE_SIZE : articleListParam.getPageSize();
+        String merchantNo = articleListParam.getMerchantNo() == null ? "" : articleListParam.getMerchantNo();
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
@@ -63,6 +64,9 @@ public class ClientArticleController extends BaseController {
         if (StringUtil.isNotEmpty(title)) {
             params.put("title", title);
         }
+        if (StringUtil.isNotEmpty(merchantNo)) {
+            params.put("merchantNo", merchantNo);
+        }
         paginationRequest.setSearchParams(params);
         PaginationResponse<ArticleDto> paginationResponse = articleService.queryArticleListByPagination(paginationRequest);
 

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBalanceController.java

@@ -68,23 +68,30 @@ public class ClientBalanceController extends BaseController {
     @Autowired
     private MemberService memberService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 充值配置
      *
-     * @param request  Request对象
+     * @param request Request对象
      */
     @RequestMapping(value = "/setting", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject setting(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String merchantNo = request.getHeader("merchantNo");
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
         if (userInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
 
         Map<String, Object> outParams = new HashMap<>();
-
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.BALANCE.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        List<MtSetting> settingList = settingService.getSettingList(merchantId, SettingTypeEnum.BALANCE.getKey());
 
         List<RechargeRuleDto> rechargeRuleList = new ArrayList<>();
         String status = StatusEnum.DISABLE.getKey();
@@ -131,6 +138,7 @@ public class ClientBalanceController extends BaseController {
     public ResponseObject doRecharge(HttpServletRequest request, @RequestBody RechargeParam rechargeParam) throws BusinessCheckException {
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
         String platform = request.getHeader("platform") == null ? "" : request.getHeader("platform");
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
 
         String token = request.getHeader("Access-Token");
         if (StringUtil.isEmpty(token)) {
@@ -148,9 +156,11 @@ public class ClientBalanceController extends BaseController {
             return getFailureResult(2000, "请确认充值金额");
         }
 
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+
         // 充值赠送金额
         String ruleParam = "";
-        MtSetting mtSetting = settingService.querySettingByName(BalanceSettingEnum.RECHARGE_RULE.getKey());
+        MtSetting mtSetting = settingService.querySettingByName(merchantId, BalanceSettingEnum.RECHARGE_RULE.getKey());
         if (StringUtil.isNotEmpty(rechargeAmount) && mtSetting != null) {
             if (mtSetting.getValue() != null && StringUtil.isNotEmpty(mtSetting.getValue())) {
                 String rules[] = mtSetting.getValue().split(",");
@@ -192,6 +202,7 @@ public class ClientBalanceController extends BaseController {
         orderDto.setOrderMode("");
         orderDto.setCouponId(0);
         orderDto.setPlatform(platform);
+        orderDto.setMerchantId(merchantId);
 
         MtOrder orderInfo = orderService.saveOrder(orderDto);
 

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -68,6 +68,12 @@ public class ClientCartController extends BaseController {
     @Autowired
     private MemberService memberService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 保存购物车
      */
@@ -76,6 +82,7 @@ public class ClientCartController extends BaseController {
     @CrossOrigin
     public ResponseObject save(HttpServletRequest request, @RequestBody CartSaveParam cartSaveParam) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
         Integer cartId = cartSaveParam.getCartId() == null ? 0 : cartSaveParam.getCartId();
         Integer goodsId = cartSaveParam.getGoodsId() == null ? 0 : cartSaveParam.getGoodsId();
@@ -118,6 +125,8 @@ public class ClientCartController extends BaseController {
             return getFailureResult(201, "该商品ID异常");
         }
 
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+
         MtCart mtCart = new MtCart();
         mtCart.setGoodsId(goodsId);
         mtCart.setUserId(mtUser.getId());
@@ -127,6 +136,7 @@ public class ClientCartController extends BaseController {
         mtCart.setId(cartId);
         mtCart.setHangNo(hangNo);
         mtCart.setIsVisitor(YesOrNoEnum.NO.getKey());
+        mtCart.setMerchantId(merchantId);
 
         try {
             Integer id = cartService.saveCart(mtCart, action);
@@ -183,6 +193,7 @@ public class ClientCartController extends BaseController {
     @CrossOrigin
     public ResponseObject list(HttpServletRequest request, @RequestBody CartListParam cartListParam) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
         String platform = request.getHeader("platform") == null ? "" : request.getHeader("platform");
         Integer goodsId = cartListParam.getGoodsId() == null ? 0 : cartListParam.getGoodsId();
@@ -269,7 +280,8 @@ public class ClientCartController extends BaseController {
             cartList.add(mtCart);
         }
 
-        result = orderService.calculateCartGoods(mtUser.getId(), cartList, userCouponId, isUsePoint, platform, OrderModeEnum.EXPRESS.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        result = orderService.calculateCartGoods(merchantId, mtUser.getId(), cartList, userCouponId, isUsePoint, platform, OrderModeEnum.EXPRESS.getKey());
 
         return getSuccessResult(result);
     }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientGiveController.java

@@ -68,6 +68,7 @@ public class ClientGiveController extends BaseController {
         MtUser mtUser = memberService.queryMemberById(userInfo.getId());
         giveParam.setUserId(mtUser.getId());
         giveParam.setStoreId(mtUser.getStoreId());
+        giveParam.setMerchantId(mtUser.getMerchantId());
 
         try {
             /*

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientGoodsController.java

@@ -8,6 +8,7 @@ import com.fuint.common.enums.YesOrNoEnum;
 import com.fuint.common.param.GoodsInfoParam;
 import com.fuint.common.service.CateService;
 import com.fuint.common.service.GoodsService;
+import com.fuint.common.service.MerchantService;
 import com.fuint.common.service.SettingService;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -59,6 +60,12 @@ public class ClientGoodsController extends BaseController {
     @Autowired
     private SettingService settingService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 获取商品分类列表
      */
@@ -121,6 +128,7 @@ public class ClientGoodsController extends BaseController {
     @CrossOrigin
     public ResponseObject search(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         Integer page = params.get("page") == null ? 1 : Integer.parseInt(params.get("page").toString());
         Integer pageSize = params.get("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(params.get("pageSize").toString());
         String name = params.get("name") == null ? "" : params.get("name").toString();
@@ -141,6 +149,10 @@ public class ClientGoodsController extends BaseController {
         if (StringUtil.isNotEmpty(name)) {
             searchParams.put("name", name);
         }
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        if (merchantId > 0 ) {
+            searchParams.put("merchantId", merchantId);
+        }
 
         paginationRequest.setSearchParams(searchParams);
         paginationRequest.setSortColumn(new String[]{"sort asc", "id desc"});

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientMessageController.java

@@ -3,6 +3,7 @@ package com.fuint.module.clientApi.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.fuint.common.dto.UserInfo;
 import com.fuint.common.enums.SettingTypeEnum;
+import com.fuint.common.service.MerchantService;
 import com.fuint.common.service.MessageService;
 import com.fuint.common.service.SettingService;
 import com.fuint.common.util.TokenUtil;
@@ -42,6 +43,12 @@ public class ClientMessageController extends BaseController {
     @Autowired
     private SettingService settingService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 查询最新一条未读消息
      *
@@ -120,11 +127,12 @@ public class ClientMessageController extends BaseController {
     @RequestMapping(value = "/getSubTemplate", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject getSubTemplate(HttpServletRequest request) throws BusinessCheckException {
+        String merchantNo = request.getHeader("merchantNo");
         String keys =  request.getParameter("keys") == null ? "" :request.getParameter("keys");
 
         List<String> dataList = new ArrayList<>();
-
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.SUB_MESSAGE.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        List<MtSetting> settingList = settingService.getSettingList(merchantId, SettingTypeEnum.SUB_MESSAGE.getKey());
         for (MtSetting mtSetting : settingList) {
             if (keys.indexOf(mtSetting.getName()) >= 0) {
                 try {

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPayController.java

@@ -110,7 +110,7 @@ public class ClientPayController extends BaseController {
         MtUser mtUser = memberService.queryMemberById(userInfo.getId());
         Map<String, Object> outParams = new HashMap<>();
 
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.POINT.getKey());
+        List<MtSetting> settingList = settingService.getSettingList(mtUser.getMerchantId(), SettingTypeEnum.POINT.getKey());
         String canUsedAsMoney = "false";
         String exchangeNeedPoint = "0";
         for (MtSetting setting : settingList) {

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientRefundController.java

@@ -108,6 +108,10 @@ public class ClientRefundController extends BaseController {
         if (order.getStoreInfo() != null) {
             refundDto.setStoreId(order.getStoreInfo().getId());
         }
+        refundDto.setMerchantId(order.getMerchantId());
+        if (order.getStoreInfo() != null) {
+            refundDto.setStoreId(order.getStoreInfo().getId());
+        }
         refundDto.setAmount(order.getPayAmount());
         refundDto.setImages(images);
         MtRefund refundInfo = refundService.createRefund(refundDto);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserController.java

@@ -85,6 +85,12 @@ public class ClientUserController extends BaseController {
     @Autowired
     private WeixinService weixinService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 获取会员信息
      */
@@ -189,10 +195,12 @@ public class ClientUserController extends BaseController {
     @ApiOperation(value = "获取会员设置")
     @RequestMapping(value = "/setting", method = RequestMethod.GET)
     @CrossOrigin
-    public ResponseObject setting() throws BusinessCheckException {
+    public ResponseObject setting(HttpServletRequest request) throws BusinessCheckException {
+        String merchantNo = request.getHeader("merchantNo");
         Map<String, Object> outParams = new HashMap<>();
 
-        List<MtSetting> settingList = settingService.getSettingList(SettingTypeEnum.USER.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        List<MtSetting> settingList = settingService.getSettingList(merchantId, SettingTypeEnum.USER.getKey());
 
         for (MtSetting setting : settingList) {
             if (setting.getName().equals("getCouponNeedPhone")) {

fuint-application/src/main/java/com/fuint/module/schedule/CouponExpireJob.java

@@ -103,7 +103,7 @@ public class CouponExpireJob {
                             params.put("expireTime", couponExpireTime);
                             params.put("name", couponInfo.getName());
                             params.put("tips", "您的卡券即将到期，请留意~");
-                            weixinService.sendSubscribeMessage(userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_EXPIRE.getKey(), "pages/user/index", params, sendTime);
+                            weixinService.sendSubscribeMessage(userInfo.getMerchantId(), userInfo.getId(), userInfo.getOpenId(), WxMessageEnum.COUPON_EXPIRE.getKey(), "pages/user/index", params, sendTime);
                             mtUserCoupon.setExpireTime(null);
                             mtUserCouponMapper.updateById(mtUserCoupon);
                         }

fuint-repository/src/main/java/com/fuint/repository/mapper/MtSettingMapper.java

@@ -3,7 +3,6 @@ package com.fuint.repository.mapper;
 import com.fuint.repository.model.MtSetting;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
 
 /**
@@ -14,8 +13,8 @@ import java.util.List;
  */
 public interface MtSettingMapper extends BaseMapper<MtSetting> {
 
-    List<MtSetting> querySettingByType(@Param("type") String type);
+    List<MtSetting> querySettingByType(@Param("merchantId") Integer merchantId, @Param("type") String type);
 
-    MtSetting querySettingByName(@Param("name") String name);
+    MtSetting querySettingByName(@Param("merchantId") Integer merchantId, @Param("name") String name);
 
 }

fuint-repository/src/main/java/com/fuint/repository/model/MtArticle.java

@@ -34,6 +34,9 @@ public class MtArticle implements Serializable {
     @ApiModelProperty("简介")
     private String brief;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtBalance.java

@@ -29,6 +29,9 @@ public class MtBalance implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtBanner.java

@@ -31,6 +31,9 @@ public class MtBanner implements Serializable {
     @ApiModelProperty("标题")
     private String title;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCart.java

@@ -31,6 +31,9 @@ public class MtCart implements Serializable {
     @ApiModelProperty("会员ID")
     private Integer userId;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionLog.java

@@ -38,6 +38,9 @@ public class MtCommissionLog implements Serializable {
     @ApiModelProperty("会员ID")
     private Integer userId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRule.java

@@ -37,6 +37,9 @@ public class MtCommissionRule implements Serializable {
     @ApiModelProperty("分佣对象")
     private String target;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("适用店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtConfirmLog.java

@@ -38,6 +38,9 @@ public class MtConfirmLog implements Serializable {
     @ApiModelProperty("卡券ID")
     private Integer couponId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("用户券ID")
     private Integer userCouponId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCoupon.java

@@ -32,6 +32,12 @@ public class MtCoupon implements Serializable {
     @ApiModelProperty("券组ID")
     private Integer groupId;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
     @ApiModelProperty("券类型，C优惠券；P储值卡；T计次卡")
     private String type;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCouponGroup.java

@@ -31,6 +31,12 @@ public class MtCouponGroup implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
     @ApiModelProperty("券组名称")
     private String name;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtGive.java

@@ -32,6 +32,9 @@ public class MtGive implements Serializable {
     @ApiModelProperty("获赠者用户ID")
     private Integer userId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtGiveItem.java

@@ -43,5 +43,4 @@ public class MtGiveItem implements Serializable {
     @ApiModelProperty("状态，A正常；D删除")
     private String status;
 
-
 }

fuint-repository/src/main/java/com/fuint/repository/model/MtGoods.java

@@ -29,6 +29,9 @@ public class MtGoods implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtGoodsCate.java

@@ -28,6 +28,9 @@ public class MtGoodsCate implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtOpenGift.java

@@ -28,6 +28,9 @@ public class MtOpenGift implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java

@@ -44,6 +44,9 @@ public class MtOrder implements Serializable {
     @ApiModelProperty("卡券ID")
     private Integer couponId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtPoint.java

@@ -28,6 +28,9 @@ public class MtPoint implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("所属店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtRefund.java

@@ -32,6 +32,9 @@ public class MtRefund implements Serializable {
     @ApiModelProperty("订单ID")
     private Integer orderId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtSendLog.java

@@ -28,6 +28,12 @@ public class MtSendLog implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
     @ApiModelProperty("1：单用户发券；2：批量发券")
     private Integer type;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtSetting.java

@@ -30,6 +30,12 @@ public class MtSetting implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
     @ApiModelProperty("类型")
     private String type;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtSmsSendedLog.java

@@ -28,6 +28,12 @@ public class MtSmsSendedLog implements Serializable {
     @TableId(value = "LOG_ID", type = IdType.AUTO)
     private Integer logId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
     @ApiModelProperty("手机号")
     private String mobilePhone;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtSmsTemplate.java

@@ -30,6 +30,12 @@ public class MtSmsTemplate implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
     @ApiModelProperty("名称")
     private String name;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtStaff.java

@@ -43,7 +43,10 @@ public class MtStaff implements Serializable {
     @ApiModelProperty("微信号")
     private String wechat;
 
-    @ApiModelProperty("对应的核销店铺id")
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
     @ApiModelProperty("创建时间")

fuint-repository/src/main/java/com/fuint/repository/model/MtStock.java

@@ -28,6 +28,9 @@ public class MtStock implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtUser.java

@@ -88,6 +88,9 @@ public class MtUser implements Serializable {
     @ApiModelProperty("地址")
     private String address;
 
+    @ApiModelProperty("所属商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("默认店铺")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtUserAction.java

@@ -31,6 +31,9 @@ public class MtUserAction implements Serializable {
     @ApiModelProperty("会员ID")
     private Integer userId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtUserCoupon.java

@@ -50,6 +50,9 @@ public class MtUserCoupon implements Serializable {
     @ApiModelProperty("用户ID")
     private Integer userId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("使用店铺ID")
     private Integer storeId;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java

@@ -5,16 +5,13 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * <p>
- * 
- * </p>
+ * 会员等级表
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
@@ -31,6 +28,9 @@ public class MtUserGrade implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("等级")
     private Integer grade;
 

fuint-repository/src/main/resources/mapper/MtSettingMapper.xml

@@ -3,9 +3,21 @@
 <mapper namespace="com.fuint.repository.mapper.MtSettingMapper">
     <select id="querySettingByType" resultType="com.fuint.repository.model.MtSetting">
         select * from mt_setting t where t.TYPE = #{type}
+        <if test="merchantId != null and merchantId > 0">
+            and (t.MERCHANT_ID = #{merchantId} or t.MERCHANT_ID = 0)
+        </if>
+        <if test="storeId != null and storeId > 0">
+            and (t.STORE_ID = #{storeId} or t.STORE_ID = 0)
+        </if>
     </select>
 
     <select id="querySettingByName" resultType="com.fuint.repository.model.MtSetting">
         select * from mt_setting t where t.NAME = #{name} limit 1
+        <if test="merchantId != null and merchantId > 0">
+            and (t.MERCHANT_ID = #{merchantId} or t.MERCHANT_ID = 0)
+        </if>
+        <if test="storeId != null and storeId > 0">
+            and (t.STORE_ID = #{storeId} or t.STORE_ID = 0)
+        </if>
     </select>
 </mapper>