fixed 多商户功能迭代

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

@@ -19,6 +19,11 @@ public class BannerDto implements Serializable {
     */
     private String title;
 
+    /**
+     * 所属商户
+     * */
+    private Integer merchantId;
+
     /**
      * 所属店铺
      * */
@@ -76,6 +81,12 @@ public class BannerDto implements Serializable {
     public void setTitle(String title){
     this.title=title;
     }
+    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/CouponCellDto.java

@@ -6,6 +6,9 @@ public class CouponCellDto {
 
     private String mobile;
 
+    // 商户ID
+    private Integer merchantId;
+
     // 分组ID
     private List<Integer> groupId;
 
@@ -20,6 +23,14 @@ public class CouponCellDto {
         this.mobile = mobile;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
     public List<Integer> getGroupId() {
         return groupId;
     }

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

@@ -47,10 +47,11 @@ public interface GoodsService {
     /**
      * 根据编码获取商品信息
      *
+     * @param  merchantId
      * @param  goodsNo
      * @throws BusinessCheckException
      */
-    MtGoods queryGoodsByGoodsNo(String goodsNo) throws BusinessCheckException;
+    MtGoods queryGoodsByGoodsNo(Integer merchantId, String goodsNo) throws BusinessCheckException;
 
     /**
      * 根据条码获取sku信息
@@ -116,5 +117,5 @@ public interface GoodsService {
      * @param params
      * @return
      */
-    PaginationResponse<GoodsDto> selectGoodsList(Map<String, Object> params);
+    PaginationResponse<GoodsDto> selectGoodsList(Map<String, Object> params) throws BusinessCheckException;
 }

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

@@ -63,10 +63,11 @@ public interface MemberService extends IService<MtUser> {
     /**
      * 通过手机号添加会员
      *
+     * @param  merchantId
      * @param  mobile
      * @throws BusinessCheckException
      */
-    MtUser addMemberByMobile(String mobile) throws BusinessCheckException;
+    MtUser addMemberByMobile(Integer merchantId, String mobile) throws BusinessCheckException;
 
     /**
      * 根据会员ID获取会员信息
@@ -79,18 +80,20 @@ public interface MemberService extends IService<MtUser> {
     /**
      * 根据会员名称获取会员信息
      *
+     * @param  merchantId
      * @param  name 会员名称
      * @throws BusinessCheckException
      */
-    MtUser queryMemberByName(String name) throws BusinessCheckException;
+    MtUser queryMemberByName(Integer merchantId, String name) throws BusinessCheckException;
 
     /**
      * 根据会员ID获取会员信息
      *
+     * @param  merchantId
      * @param  openId 微信openId
      * @throws BusinessCheckException
      */
-    MtUser queryMemberByOpenId(String openId, JSONObject userInfo) throws BusinessCheckException;
+    MtUser queryMemberByOpenId(Integer merchantId, String openId, JSONObject userInfo) throws BusinessCheckException;
 
     /**
      * 根据会员组ID获取会员组信息
@@ -103,10 +106,11 @@ public interface MemberService extends IService<MtUser> {
     /**
      * 根据会员手机获取会员信息
      *
+     * @param merchantId
      * @param  mobile 会员手机
      * @throws BusinessCheckException
      */
-    MtUser queryMemberByMobile(String mobile) throws BusinessCheckException;
+    MtUser queryMemberByMobile(Integer merchantId, String mobile) throws BusinessCheckException;
 
     /**
      * 根据会员号获取会员信息

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

@@ -64,6 +64,10 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtBanner::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtBanner::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtBanner::getStoreId, storeId);
@@ -101,7 +105,7 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
         mtBanner.setUpdateTime(new Date());
         mtBanner.setCreateTime(new Date());
         mtBanner.setSort(bannerDto.getSort());
-
+        mtBanner.setMerchantId(bannerDto.getMerchantId());
         Integer id = mtBannerMapper.insert(mtBanner);
         if (id > 0) {
             return mtBanner;
@@ -188,6 +192,7 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
     public List<MtBanner> queryBannerListByParams(Map<String, Object> params) {
         String status =  params.get("status") == null ? StatusEnum.ENABLED.getKey(): params.get("status").toString();
         String storeId =  params.get("storeId") == null ? "" : params.get("storeId").toString();
+        String merchantId =  params.get("merchantId") == null ? "" : params.get("merchantId").toString();
         String title = params.get("title") == null ? "" : params.get("title").toString();
 
         LambdaQueryWrapper<MtBanner> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -197,6 +202,9 @@ public class BannerServiceImpl extends ServiceImpl<MtBannerMapper, MtBanner> imp
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtBanner::getStatus, status);
         }
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtBanner::getMerchantId, merchantId);
+        }
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.and(wq -> wq
                               .eq(MtBanner::getStoreId, 0)

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

@@ -72,6 +72,10 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtGoodsCate::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtGoodsCate::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.and(wq -> wq
@@ -121,6 +125,7 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         mtCate.setLogo(reqDto.getLogo());
         mtCate.setDescription(reqDto.getDescription());
         mtCate.setOperator(reqDto.getOperator());
+        mtCate.setMerchantId(reqDto.getMerchantId());
         mtCate.setStoreId(reqDto.getStoreId() == null ? 0 : reqDto.getStoreId());
         mtCate.setUpdateTime(new Date());
         mtCate.setCreateTime(new Date());
@@ -205,6 +210,9 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         if (reqDto.getSort() != null) {
             mtCate.setSort(reqDto.getSort());
         }
+        if (reqDto.getMerchantId() != null) {
+            mtCate.setMerchantId(reqDto.getMerchantId());
+        }
         if (reqDto.getStoreId() != null) {
             mtCate.setStoreId(reqDto.getStoreId());
         }
@@ -217,6 +225,10 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         LambdaQueryWrapper<MtGoodsCate> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtGoodsCate::getStatus, StatusEnum.DISABLE.getKey());
         String storeId =  params.get("storeId") == null ? "" : params.get("storeId").toString();
+        String merchantId =  params.get("merchantId") == null ? "" : params.get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.like(MtGoodsCate::getMerchantId, merchantId);
+        }
         String name =  params.get("name") == null ? "" : params.get("name").toString();
         if (StringUtils.isNotBlank(name)) {
             lambdaQueryWrapper.like(MtGoodsCate::getName, name);

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

@@ -313,6 +313,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
 
             List<String> rowContent = content.get(i);
             String mobile = rowContent.get(0);
+            String merchantId = rowContent.get(1);
 
             if (StringUtil.isBlank(mobile) || mobile.length() < 11 || mobile.length() > 11) {
                 errorMsg.append("第" + i + "行错误,手机号有误:"+mobile);
@@ -361,7 +362,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
             item.setMobile(mobile);
             item.setGroupId(groupIdArr);
             item.setNum(numArr);
-
+            item.setMerchantId(Integer.parseInt(merchantId));
             rows.add(item);
         }
 
@@ -376,9 +377,9 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
         // 获取每个分组的总数
         Map<String, Integer> couponIdMap = new HashMap<>();
         for (CouponCellDto dto : rows) {
-            MtUser userInfo = memberService.queryMemberByMobile(dto.getMobile());
+            MtUser userInfo = memberService.queryMemberByMobile(dto.getMerchantId(), dto.getMobile());
             if (userInfo == null) {
-                userInfo = memberService.addMemberByMobile(dto.getMobile());
+                userInfo = memberService.addMemberByMobile(dto.getMerchantId(), dto.getMobile());
             }
 
             if (null == userInfo || !userInfo.getStatus().equals(StatusEnum.ENABLED.getKey())) {
@@ -460,7 +461,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
                     }
                 }
 
-                MtUser mtUser = memberService.queryMemberByMobile(cellDto.getMobile());
+                MtUser mtUser = memberService.queryMemberByMobile(cellDto.getMerchantId(), cellDto.getMobile());
 
                 // 发放记录
                 ReqSendLogDto dto = new ReqSendLogDto();

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

@@ -517,14 +517,13 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "发放卡券")
     public void sendCoupon(Integer couponId, String mobile, Integer num, String uuid, String operator) throws BusinessCheckException {
-        MtUser userInfo = memberService.queryMemberByMobile(mobile);
+        MtCoupon couponInfo = queryCouponById(couponId);
+        MtUser userInfo = memberService.queryMemberByMobile(couponInfo.getMerchantId(), mobile);
 
         if (null == userInfo || !userInfo.getStatus().equals(StatusEnum.ENABLED.getKey())) {
             throw new BusinessCheckException("该会员不存在或已禁用，请先注册会员");
         }
 
-        MtCoupon couponInfo = queryCouponById(couponId);
-
         // 判断券是否有效
         if (!couponInfo.getStatus().equals(StatusEnum.ENABLED.getKey())) {
             throw new BusinessCheckException("卡券“"+couponInfo.getName()+"”已停用,不能发放");

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

@@ -163,7 +163,7 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
         }
 
         // 如果赠予对象为空，则注册
-        MtUser user = memberService.queryMemberByMobile(mobile);
+        MtUser user = memberService.queryMemberByMobile(merchantId, mobile);
         if (null == user) {
             MtUser userInfo = new MtUser();
             userInfo.setMerchantId(merchantId);

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

@@ -283,13 +283,13 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
     /**
      * 根据编码获取商品信息
      *
+     * @param  merchantId
      * @param  goodsNo
      * @throws BusinessCheckException
      */
     @Override
-    public MtGoods queryGoodsByGoodsNo(String goodsNo) {
-        MtGoods mtGoods = mtGoodsMapper.getByGoodsNo(goodsNo);
-        return mtGoods;
+    public MtGoods queryGoodsByGoodsNo(Integer merchantId, String goodsNo) {
+        return mtGoodsMapper.getByGoodsNo(merchantId, goodsNo);
     }
 
     /**
@@ -410,7 +410,12 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * @return
      * */
     @Override
-    public List<MtGoods> getStoreGoodsList(Integer storeId, String keyword) {
+    public List<MtGoods> getStoreGoodsList(Integer storeId, String keyword) throws BusinessCheckException {
+        MtStore mtStore = storeService.queryStoreById(storeId);
+        if (mtStore == null) {
+            return new ArrayList<>();
+        }
+        Integer merchantId = mtStore.getMerchantId() == null ? 0 : mtStore.getMerchantId();
         List<MtGoods> goodsList = new ArrayList<>();
         List<MtGoodsSku> skuList = new ArrayList<>();
         if (StringUtil.isNotEmpty(keyword)) {
@@ -421,9 +426,9 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
             goodsList.add(goods);
         } else {
             if (keyword != null && StringUtil.isNotEmpty(keyword)) {
-                goodsList = mtGoodsMapper.searchStoreGoodsList(storeId, keyword);
+                goodsList = mtGoodsMapper.searchStoreGoodsList(merchantId, storeId, keyword);
             } else {
-                goodsList = mtGoodsMapper.getStoreGoodsList(storeId);
+                goodsList = mtGoodsMapper.getStoreGoodsList(merchantId, storeId);
             }
         }
         List<MtGoods> dataList = new ArrayList<>();
@@ -515,16 +520,17 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * @return
      */
     @Override
-    public PaginationResponse<GoodsDto> selectGoodsList(Map<String, Object> params) {
+    public PaginationResponse<GoodsDto> selectGoodsList(Map<String, Object> params) throws BusinessCheckException {
         Integer page = params.get("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(params.get("page").toString());
         Integer pageSize = params.get("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(params.get("pageSize").toString());
         Integer storeId = params.get("storeId") == null ? 0 : Integer.parseInt(params.get("storeId").toString());
         Integer cateId = params.get("cateId") == null ? 0 : Integer.parseInt(params.get("cateId").toString());
         String keyword = params.get("keyword") == null ? "" : params.get("keyword").toString();
 
+        MtStore mtStore = storeService.queryStoreById(storeId);
         Page<MtGoods> pageHelper = PageHelper.startPage(page, pageSize);
         List<GoodsDto> dataList = new ArrayList<>();
-        List<GoodsBean> goodsList = mtGoodsMapper.selectGoodsList(storeId, cateId, keyword);
+        List<GoodsBean> goodsList = mtGoodsMapper.selectGoodsList(mtStore.getMerchantId(), storeId, cateId, keyword);
 
         for (GoodsBean goodsBean : goodsList) {
              GoodsDto goodsDto = new GoodsDto();

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

@@ -311,7 +311,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
     public MtUser addMember(MtUser mtUser) throws BusinessCheckException {
         // 手机号已存在
         if (StringUtil.isNotEmpty(mtUser.getMobile())) {
-            MtUser userInfo = queryMemberByMobile(mtUser.getMobile());
+            MtUser userInfo = queryMemberByMobile(mtUser.getMerchantId(), mtUser.getMobile());
             if (userInfo != null) {
                 return userInfo;
             }
@@ -319,7 +319,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
 
         String userNo = CommonUtil.createUserNo();
         // 会员名称已存在
-        List<MtUser> userList = mtUserMapper.queryMemberByName(mtUser.getName());
+        List<MtUser> userList = mtUserMapper.queryMemberByName(mtUser.getMerchantId(), mtUser.getName());
         if (userList.size() > 0) {
             mtUser.setName(userNo);
         }
@@ -441,7 +441,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "通过手机号新增会员")
-    public MtUser addMemberByMobile(String mobile) throws BusinessCheckException {
+    public MtUser addMemberByMobile(Integer merchantId, String mobile) throws BusinessCheckException {
         MtUser mtUser = new MtUser();
         mtUser.setUserNo(CommonUtil.createUserNo());
         String nickName = mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2");
@@ -459,10 +459,11 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         mtUser.setDescription("手机号登录自动注册");
         mtUser.setIdcard("");
         mtUser.setStatus(StatusEnum.ENABLED.getKey());
+        mtUser.setMerchantId(merchantId);
         mtUser.setStoreId(0);
         mtUser.setSource(MemberSourceEnum.MOBILE_LOGIN.getKey());
         mtUserMapper.insert(mtUser);
-        mtUser = queryMemberByMobile(mobile);
+        mtUser = queryMemberByMobile(merchantId, mobile);
 
         // 开卡赠礼
         openGiftService.openGift(mtUser.getId(), Integer.parseInt(mtUser.getGradeId()), true);
@@ -472,15 +473,16 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
     /**
      * 根据手机号获取会员信息
      *
+     * @param  merchantId
      * @param  mobile 手机号
      * @throws BusinessCheckException
      */
     @Override
-    public MtUser queryMemberByMobile(String mobile) {
+    public MtUser queryMemberByMobile(Integer merchantId, String mobile) {
         if (mobile == null || StringUtil.isEmpty(mobile)) {
             return null;
         }
-        List<MtUser> mtUser = mtUserMapper.queryMemberByMobile(mobile);
+        List<MtUser> mtUser = mtUserMapper.queryMemberByMobile(merchantId, mobile);
         if (mtUser.size() > 0) {
             return mtUser.get(0);
         } else {
@@ -555,13 +557,14 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
     /**
      * 根据会员名称获取会员信息
      *
+     * @param  merchantId 商户ID
      * @param  name 会员名称
      * @throws BusinessCheckException
      */
     @Override
-    public MtUser queryMemberByName(String name) {
+    public MtUser queryMemberByName(Integer merchantId, String name) {
         if (StringUtil.isNotEmpty(name)) {
-            List<MtUser> userList = mtUserMapper.queryMemberByName(name);
+            List<MtUser> userList = mtUserMapper.queryMemberByName(merchantId, name);
             if (userList.size() == 1) {
                 return userList.get(0);
             }
@@ -572,12 +575,13 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
     /**
      * 根据openId获取会员信息(为空就注册)
      *
+     * @param  merchantId
      * @param  openId
      * @throws BusinessCheckException
      */
     @Override
-    public MtUser queryMemberByOpenId(String openId, JSONObject userInfo) throws BusinessCheckException {
-        MtUser user = mtUserMapper.queryMemberByOpenId(openId);
+    public MtUser queryMemberByOpenId(Integer merchantId, String openId, JSONObject userInfo) throws BusinessCheckException {
+        MtUser user = mtUserMapper.queryMemberByOpenId(merchantId, openId);
 
         String avatar = StringUtil.isNotEmpty(userInfo.getString("avatarUrl")) ? userInfo.getString("avatarUrl") : "";
         String gender = StringUtil.isNotEmpty(userInfo.getString("gender")) ? userInfo.getString("gender") : GenderEnum.MAN.getKey().toString();
@@ -592,7 +596,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         if (user == null) {
             MtUser mtUser = new MtUser();
             if (StringUtil.isNotEmpty(mobile)) {
-                MtUser mtUserMobile = queryMemberByMobile(mobile);
+                MtUser mtUserMobile = queryMemberByMobile(merchantId, mobile);
                 if (mtUserMobile != null) {
                     mtUser = mtUserMobile;
                 }
@@ -642,7 +646,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
             } else {
                 updateById(mtUser);
             }
-            user = mtUserMapper.queryMemberByOpenId(openId);
+            user = mtUserMapper.queryMemberByOpenId(merchantId, openId);
 
             // 开卡赠礼
             openGiftService.openGift(user.getId(), Integer.parseInt(user.getGradeId()), true);

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

@@ -162,7 +162,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             lambdaQueryWrapper.eq(MtOrder::getPayStatus, payStatus);
         }
         if (StringUtil.isNotEmpty(mobile)) {
-            MtUser userInfo = memberService.queryMemberByMobile(mobile);
+            MtUser userInfo = memberService.queryMemberByMobile(merchantId, mobile);
             if (userInfo != null) {
                 userId = userInfo.getId() + "";
             } else {

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

@@ -76,6 +76,10 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         if (StringUtils.isNotBlank(userId)) {
             lambdaQueryWrapper.eq(MtPoint::getUserId, userId);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtPoint::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtPoint::getStoreId, storeId);
@@ -127,7 +131,6 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         mtPoint.setStatus(StatusEnum.ENABLED.getKey());
         mtPoint.setCreateTime(new Date());
         mtPoint.setUpdateTime(new Date());
-
         if (mtPoint.getOperator() != null) {
             mtPoint.setOperator(mtPoint.getOperator());
         }
@@ -145,6 +148,7 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         if (mtUser.getStoreId() != null) {
             mtPoint.setStoreId(mtUser.getStoreId());
         }
+        mtPoint.setMerchantId(mtUser.getMerchantId());
         mtUserMapper.updateById(mtUser);
         mtPointMapper.insert(mtPoint);
 
@@ -178,10 +182,10 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         }
 
         MtUser userInfo = memberService.queryMemberById(userId);
-        MtUser fUserInfo = memberService.queryMemberByMobile(mobile);
+        MtUser fUserInfo = memberService.queryMemberByMobile(userInfo.getMerchantId(), mobile);
         // 自动注册会员
         if (fUserInfo == null) {
-            fUserInfo = memberService.addMemberByMobile(mobile);
+            fUserInfo = memberService.addMemberByMobile(userInfo.getMerchantId(), mobile);
         }
 
         if (fUserInfo == null) {
@@ -216,6 +220,7 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         fMtPoint.setOrderSn("");
         fMtPoint.setDescription(remark);
         fMtPoint.setUserId(fUserInfo.getId());
+        fMtPoint.setMerchantId(fUserInfo.getMerchantId());
         mtPointMapper.insert(fMtPoint);
 
         MtPoint mtPoint = new MtPoint();
@@ -227,6 +232,7 @@ public class PointServiceImpl extends ServiceImpl<MtPointMapper, MtPoint> implem
         mtPoint.setOperator(userInfo.getName());
         mtPoint.setOrderSn("");
         mtPoint.setDescription("转赠好友");
+        mtPoint.setMerchantId(userInfo.getMerchantId());
         mtPointMapper.insert(mtPoint);
 
         return true;

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

@@ -179,10 +179,10 @@ public class SettlementServiceImpl implements SettlementService {
         if ((userInfo == null || StringUtil.isEmpty(token))) {
             String mobile = param.getMobile() == null ? "" : param.getMobile();
             if (StringUtil.isNotEmpty(operator) && StringUtil.isNotEmpty(mobile)) {
-                userInfo = memberService.queryMemberByMobile(mobile);
+                userInfo = memberService.queryMemberByMobile(merchantId, mobile);
                 // 自动注册会员
                 if (userInfo == null) {
-                    userInfo = memberService.addMemberByMobile(mobile);
+                    userInfo = memberService.addMemberByMobile(merchantId, mobile);
                 }
             }
         }

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

@@ -68,6 +68,10 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtUserGrade::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtUserGrade::getMerchantId, merchantId);
+        }
 
         lambdaQueryWrapper.orderByDesc(MtUserGrade::getId);
         List<MtUserGrade> dataList = mtUserGradeMapper.selectList(lambdaQueryWrapper);
@@ -148,7 +152,7 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
     /**
      * 根据ID删除会员等级
      *
-     * @param id       ID
+     * @param id ID
      * @param operator 操作人
      */
     @Override

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

@@ -187,7 +187,7 @@ public class BackendBannerController extends BaseController {
         info.setStatus(status);
         info.setStoreId(Integer.parseInt(storeId));
         info.setSort(Integer.parseInt(sort));
-
+        info.setMerchantId(accountInfo.getMerchantId());
         if (StringUtil.isNotEmpty(id)) {
             info.setId(Integer.parseInt(id));
             bannerService.updateBanner(info);

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

@@ -265,7 +265,7 @@ public class BackendCashierController extends BaseController {
     @CrossOrigin
     public ResponseObject getMemberInfo(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        String keyword =  param.get("keyword") == null ? "" : param.get("keyword").toString();
+        String keyword = param.get("keyword") == null ? "" : param.get("keyword").toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
@@ -278,9 +278,9 @@ public class BackendCashierController extends BaseController {
 
         MtUser userInfo;
         if (PhoneFormatCheckUtils.isChinaPhoneLegal(keyword)) {
-            userInfo = memberService.queryMemberByMobile(keyword);
+            userInfo = memberService.queryMemberByMobile(accountInfo.getMerchantId(), keyword);
         } else {
-            userInfo = memberService.queryMemberByName(keyword);
+            userInfo = memberService.queryMemberByName(accountInfo.getMerchantId(), keyword);
             if (userInfo == null) {
                 userInfo = memberService.queryMemberByUserNo(keyword);
             }

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

@@ -81,7 +81,6 @@ 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) {
@@ -106,7 +105,7 @@ public class BackendConfirmLogController extends BaseController {
             searchParams.put("couponId", couponId);
         }
         if (StringUtil.isNotEmpty(mobile)) {
-            MtUser userInfo = memberService.queryMemberByMobile(mobile);
+            MtUser userInfo = memberService.queryMemberByMobile(accountInfo.getMerchantId(), mobile);
             if (userInfo != null) {
                 searchParams.put("userId", userInfo.getId().toString());
             } else {

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

@@ -461,7 +461,7 @@ public class BackendCouponController extends BaseController {
         }
 
         MtCoupon couponInfo = couponService.queryCouponById(Integer.parseInt(couponId));
-        MtUser mtUser = memberService.queryMemberByMobile(mobile);
+        MtUser mtUser = memberService.queryMemberByMobile(accountInfo.getMerchantId(), mobile);
         MtCouponGroup mtCouponGroup = couponGroupService.queryCouponGroupById(couponInfo.getGroupId());
 
         // 发放记录

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

@@ -786,7 +786,7 @@ public class BackendGoodsController extends BaseController {
     @ApiOperation(value = "获取选择商品列表")
     @RequestMapping(value = "/selectGoods", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject selectGoods(HttpServletRequest request, @RequestBody Map<String, Object> params) {
+    public ResponseObject selectGoods(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {

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

@@ -88,7 +88,7 @@ public class BackendPointController extends BaseController {
 
         Map<String, Object> searchParams = new HashMap<>();
         if (StringUtil.isNotEmpty(mobile)) {
-            MtUser userInfo = memberService.queryMemberByMobile(mobile);
+            MtUser userInfo = memberService.queryMemberByMobile(accountInfo.getMerchantId(), mobile);
             if (userInfo != null) {
                 searchParams.put("userId", userInfo.getId());
             }

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

@@ -111,7 +111,7 @@ public class BackendRefundController extends BaseController {
             }
         }
         if (StringUtil.isNotEmpty(mobile)) {
-            MtUser userInfo = memberService.queryMemberByMobile(mobile);
+            MtUser userInfo = memberService.queryMemberByMobile(account.getMerchantId(), mobile);
             if (userInfo != null) {
                 userId = userInfo.getId().toString();
             } else {

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

@@ -94,7 +94,7 @@ public class BackendSendLogController extends BaseController {
         }
 
         if (StringUtil.isNotEmpty(mobile)) {
-            MtUser userInfo = memberService.queryMemberByMobile(mobile);
+            MtUser userInfo = memberService.queryMemberByMobile(accountInfo.getMerchantId(), mobile);
             if (userInfo != null) {
                 searchParams.put("userId", userInfo.getId().toString());
             } else {

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

@@ -209,7 +209,7 @@ public class BackendUserGradeController extends BaseController {
 
         info.setGrade(Integer.parseInt(grade));
         info.setName(name);
-
+        info.setMerchantId(accountInfo.getMerchantId());
         if (StringUtil.isNotEmpty(catchType)) {
             info.setCatchType(catchType);
         }

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

@@ -2,6 +2,7 @@ package com.fuint.module.clientApi.controller;
 
 import com.fuint.common.param.MemberInfoParam;
 import com.fuint.common.service.MemberService;
+import com.fuint.common.service.MerchantService;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -11,6 +12,8 @@ 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.util.HashMap;
 import java.util.Map;
 
@@ -31,19 +34,28 @@ public class ClientCashierController extends BaseController {
     @Autowired
     private MemberService memberService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 获取会员信息
      */
     @ApiOperation(value = "查询会员信息")
     @RequestMapping(value = "/memberInfo", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject memberInfo(@RequestBody MemberInfoParam memberInfoParam) throws BusinessCheckException {
+    public ResponseObject memberInfo(HttpServletRequest request,  @RequestBody MemberInfoParam memberInfoParam) throws BusinessCheckException {
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+
         String mobile = memberInfoParam.getMobile() == null ? "" : memberInfoParam.getMobile();
         if (StringUtil.isEmpty(mobile)) {
             return getFailureResult(201);
         }
 
-        MtUser userInfo = memberService.queryMemberByMobile(mobile);
+        MtUser userInfo = memberService.queryMemberByMobile(merchantId, mobile);
         Map<String, Object> outParams = new HashMap<>();
         outParams.put("memberInfo", userInfo);
 

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

@@ -73,10 +73,15 @@ public class ClientGoodsController extends BaseController {
     @RequestMapping(value = "/cateList", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject cateList(HttpServletRequest request) throws BusinessCheckException {
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
 
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        if (merchantId > 0) {
+            param.put("merchantId", merchantId);
+        }
         if (storeId > 0) {
             param.put("storeId", storeId);
         }
@@ -282,17 +287,18 @@ public class ClientGoodsController extends BaseController {
     @ApiOperation(value = "通过sku编码获取商品信息")
     @RequestMapping(value = "/getGoodsInfoBySkuNo", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject getGoodsInfoBySkuNo(@RequestBody GoodsInfoParam goodsInfoParam) throws BusinessCheckException, InvocationTargetException, IllegalAccessException {
+    public ResponseObject getGoodsInfoBySkuNo(HttpServletRequest request, @RequestBody GoodsInfoParam goodsInfoParam) throws BusinessCheckException, InvocationTargetException, IllegalAccessException {
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         String skuNo = goodsInfoParam.getSkuNo() == null ? "" : goodsInfoParam.getSkuNo();
         if (StringUtil.isEmpty(skuNo)) {
             return getFailureResult(201, "商品编码不能为空");
         }
-
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
         Integer goodsId = 0;
         Integer skuId = 0;
         MtGoodsSku mtGoodsSku = goodsService.getSkuInfoBySkuNo(skuNo);
         if (mtGoodsSku == null) {
-            MtGoods mtGoods = goodsService.queryGoodsByGoodsNo(skuNo);
+            MtGoods mtGoods = goodsService.queryGoodsByGoodsNo(merchantId, skuNo);
             if (mtGoods != null) {
                 goodsId = mtGoods.getId();
             }

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

@@ -2,6 +2,7 @@ package com.fuint.module.clientApi.controller;
 
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.BannerService;
+import com.fuint.common.service.MerchantService;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -32,6 +33,12 @@ public class ClientPageController extends BaseController {
     @Autowired
     private BannerService bannerService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 获取页面数据
      */
@@ -39,6 +46,7 @@ public class ClientPageController extends BaseController {
     @RequestMapping(value = "/home", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject getPageData(HttpServletRequest request, @RequestParam Map<String, Object> param) throws BusinessCheckException {
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
 
         Map<String, Object> params = new HashMap<>();
@@ -46,6 +54,11 @@ public class ClientPageController extends BaseController {
         if (storeId > 0) {
             params.put("storeId", storeId);
         }
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        if (merchantId > 0) {
+            params.put("merchantId", merchantId);
+        }
+
         List<MtBanner> bannerData = bannerService.queryBannerListByParams(params);
 
         Map<String, Object> outParams = new HashMap();

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

@@ -62,6 +62,12 @@ public class ClientSignController extends BaseController {
     @Autowired
     private CaptchaService captchaService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 店铺服务接口
      * */
@@ -109,7 +115,8 @@ public class ClientSignController extends BaseController {
             }
         }
         userInfo.put("storeId", storeId);
-        MtUser mtUser = memberService.queryMemberByOpenId(loginInfo.get("openid").toString(), userInfo);
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        MtUser mtUser = memberService.queryMemberByOpenId(merchantId, loginInfo.get("openid").toString(), userInfo);
         if (mtUser == null) {
             return getFailureResult(0, "用户状态异常");
         }
@@ -178,6 +185,7 @@ public class ClientSignController extends BaseController {
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     @CrossOrigin
     public ResponseObject register(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         String account = param.get("account").toString();
         String password = param.get("password").toString();
         String captchaCode = param.get("captchaCode") == null ? "" : param.get("captchaCode").toString();
@@ -198,8 +206,8 @@ public class ClientSignController extends BaseController {
         if (!captchaVerify) {
             return getFailureResult(1002,"图形验证码有误");
         }
-
-        MtUser userData = memberService.queryMemberByName(account);
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        MtUser userData = memberService.queryMemberByName(merchantId, account);
         if (userData != null) {
             return getFailureResult(1002,"该用户名已存在");
         }
@@ -242,6 +250,7 @@ public class ClientSignController extends BaseController {
     @CrossOrigin
     public ResponseObject signIn(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         String userAgent = request.getHeader("user-agent") == null ? "" : request.getHeader("user-agent");
         String mobile = param.get("mobile") == null ? "" : param.get("mobile").toString();
         String verifyCode = param.get("verifyCode") == null ? "" : param.get("verifyCode").toString();
@@ -251,7 +260,7 @@ public class ClientSignController extends BaseController {
         String uuid = param.get("uuid") == null ? "" : param.get("uuid").toString();
         TokenDto dto = new TokenDto();
         MtUser mtUser = null;
-
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
         // 方式1：通过短信验证码登录
         if (StringUtil.isNotEmpty(mobile) && StringUtil.isNotEmpty(verifyCode)) {
             // 如果已经登录，免输入验证码
@@ -263,7 +272,7 @@ public class ClientSignController extends BaseController {
 
             // 1、验证码验证
             MtVerifyCode mtVerifyCode = verifyCodeService.checkVerifyCode(mobile, verifyCode);
-            mtUser = memberService.queryMemberByMobile(mobile);
+            mtUser = memberService.queryMemberByMobile(merchantId, mobile);
 
             if (verifyCode.equals("999999")) {
                 mtVerifyCode = new MtVerifyCode();
@@ -273,8 +282,8 @@ public class ClientSignController extends BaseController {
             // 2、写入token redis session
             if (mtVerifyCode != null) {
                 if (null == mtUser) {
-                    memberService.addMemberByMobile(mobile);
-                    mtUser = memberService.queryMemberByMobile(mobile);
+                    memberService.addMemberByMobile(merchantId, mobile);
+                    mtUser = memberService.queryMemberByMobile(merchantId, mobile);
                 }
 
                 if (!mtUser.getStatus().equals(StatusEnum.ENABLED.getKey())) {
@@ -305,7 +314,7 @@ public class ClientSignController extends BaseController {
                 return getFailureResult(1002,"图形验证码有误");
             }
 
-            MtUser userInfo = memberService.queryMemberByName(account);
+            MtUser userInfo = memberService.queryMemberByName(merchantId, account);
             if (userInfo != null) {
                 String myPassword = userInfo.getPassword();
                 String inputPassword = CommonUtil.getPassword(password, userInfo.getSalt());

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

@@ -14,14 +14,14 @@ import java.util.List;
  */
 public interface MtGoodsMapper extends BaseMapper<MtGoods> {
 
-    List<MtGoods> getStoreGoodsList(@Param("storeId") Integer storeId);
+    List<MtGoods> getStoreGoodsList(@Param("merchantId") Integer merchantId, @Param("storeId") Integer storeId);
 
-    List<MtGoods> searchStoreGoodsList(@Param("storeId") Integer storeId, @Param("keyword") String keyword);
+    List<MtGoods> searchStoreGoodsList(@Param("merchantId") Integer merchantId, @Param("storeId") Integer storeId, @Param("keyword") String keyword);
 
-    MtGoods getByGoodsNo(@Param("goodsNo") String goodsNo);
+    MtGoods getByGoodsNo(@Param("merchantId") Integer merchantId, @Param("goodsNo") String goodsNo);
 
-    Boolean updateInitSale(@Param("goodsId") Integer goodsId);
+    Boolean updateInitSale( @Param("goodsId") Integer goodsId);
 
-    List<GoodsBean> selectGoodsList(@Param("storeId") Integer storeId, @Param("cateId") Integer cateId, @Param("keyword") String keyword);
+    List<GoodsBean> selectGoodsList(@Param("merchantId") Integer merchantId, @Param("storeId") Integer storeId, @Param("cateId") Integer cateId, @Param("keyword") String keyword);
 
 }

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

@@ -15,11 +15,11 @@ import java.util.List;
  */
 public interface MtUserMapper extends BaseMapper<MtUser> {
 
-    List<MtUser> queryMemberByMobile(@Param("mobile") String mobile);
+    List<MtUser> queryMemberByMobile(@Param("merchantId") Integer merchantId, @Param("mobile") String mobile);
 
-    List<MtUser> queryMemberByName(@Param("name") String name);
+    List<MtUser> queryMemberByName(@Param("merchantId") Integer merchantId, @Param("name") String name);
 
-    MtUser queryMemberByOpenId(@Param("openId") String openId);
+    MtUser queryMemberByOpenId(@Param("merchantId") Integer merchantId, @Param("openId") String openId);
 
     List<MtUser> findMembersByUserNo(@Param("userNo") String userNo);
 

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

@@ -7,6 +7,9 @@
 
     <select id="searchStoreGoodsList" resultType="com.fuint.repository.model.MtGoods">
         select * from mt_goods t where t.STATUS = 'A'
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
         <if test="storeId != null and storeId > 0">
             and (t.STORE_ID = #{storeId} or t.STORE_ID = 0)
         </if>
@@ -16,15 +19,24 @@
 
     <select id="getByGoodsNo" resultType="com.fuint.repository.model.MtGoods">
         select * from mt_goods t where t.GOODS_NO = #{goodsNo} and t.STATUS = 'A'
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
     </select>
 
     <update id="updateInitSale">
         update mt_goods t set t.INIT_SALE = t.INIT_SALE + 1 where t.ID = #{goodsId}
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
     </update>
 
     <select id="selectGoodsList" resultType="com.fuint.repository.bean.GoodsBean">
         SELECT g.LOGO as logo,g.STORE_ID as storeId,g.ID AS goodsId,g.CATE_ID AS cateId,g.GOODS_NO AS goodsNo,g.NAME as name,g.PRICE as price, g.STOCK as stock,s.`SPEC_IDS` as specIds,s.`PRICE` as skuPrice, s.STOCK as skuStock FROM `mt_goods` g LEFT JOIN `mt_goods_sku` s ON g.id = s.`GOODS_ID`
         WHERE g.`status` = 'A'
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
         <if test="storeId != null and storeId > 0">
             AND (g.STORE_ID = #{storeId} OR g.STORE_ID = 0)
         </if>

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

@@ -3,14 +3,24 @@
 <mapper namespace="com.fuint.repository.mapper.MtUserMapper">
     <select id="queryMemberByMobile" resultType="com.fuint.repository.model.MtUser">
         select * from mt_user t where t.MOBILE = #{mobile}
+        <if test="merchantId != null and merchantId > 0">
+            WHERE t.MERCHANT_ID = #{merchantId}
+        </if>
     </select>
 
     <select id="queryMemberByName" resultType="com.fuint.repository.model.MtUser">
         select * from mt_user t where t.NAME = #{name} and t.STATUS = 'A'
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
     </select>
 
     <select id="queryMemberByOpenId" resultType="com.fuint.repository.model.MtUser">
-        select * from mt_user t where t.OPEN_ID = #{openId} and t.STATUS = 'A' limit 1
+        select * from mt_user t where t.OPEN_ID = #{openId} and t.STATUS = 'A'
+        <if test="merchantId != null and merchantId > 0">
+            AND t.MERCHANT_ID = #{merchantId}
+        </if>
+        limit 1
     </select>
 
     <select id="findMembersByUserNo" resultType="com.fuint.repository.model.MtUser">