fixed 多商户功能联调问题

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

@@ -10,6 +10,11 @@ public class RoleDto {
      */
     private Long id;
 
+    /**
+     * 商户ID
+     * */
+    private Integer merchantId;
+
     /**
      * 名称
      */
@@ -38,6 +43,14 @@ public class RoleDto {
         this.id = id;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -12,6 +12,11 @@ public class SmsTemplateDto implements Serializable {
      */
     private Integer id;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
     /**
      * 模板名称
      */
@@ -51,6 +56,12 @@ public class SmsTemplateDto implements Serializable {
     public void setId(Integer id){
         this.id=id;
     }
+    public Integer getMerchantId(){
+        return merchantId;
+    }
+    public void setMerchantId(Integer merchantId){
+        this.merchantId=merchantId;
+    }
     public String getName(){
         return name;
     }

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

@@ -13,6 +13,11 @@ public class SourceDto {
      */
     private long id;
 
+    /**
+     * 商户ID
+     */
+    private Integer merchantId;
+
     /**
      * 菜单名称
      */
@@ -96,6 +101,14 @@ public class SourceDto {
         this.id = id;
     }
 
+    public Integer getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(Integer merchantId) {
+        this.merchantId = merchantId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -28,9 +28,10 @@ public interface DutyService extends IService<TDuty> {
     /**
      * 获取有效的角色集合
      *
+     * @param merchantId 商户ID
      * @return
      */
-    List<TDuty> getAvailableRoles();
+    List<TDuty> getAvailableRoles(Integer merchantId);
 
     /**
      * 根据ID获取角色实体
@@ -80,10 +81,11 @@ public interface DutyService extends IService<TDuty> {
     /**
      * 根据角色名称合状态查询角色
      *
+     * @param merchantId
      * @param name
      * @return
      */
-    TDuty findByName(String name);
+    TDuty findByName(Integer merchantId, String name);
 
     /**
      * 根据角色名称获取已经分配的菜单ID集合
@@ -96,9 +98,10 @@ public interface DutyService extends IService<TDuty> {
     /**
      * 获取角色的树形结构
      *
+     * @param merchantId
      * @return
      */
-    List<TreeNode> getDutyTree();
+    List<TreeNode> getDutyTree(Integer merchantId);
 
     /**
      * 根据账户获取角色

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

@@ -18,13 +18,15 @@ public interface SendSmsService {
 
     /**
      * 发送短信方法
-     * @param tUname    短信模板英文名称
-     * @param phones    手机号码集合
+     *
+     * @param merchantId 商户ID
+     * @param tUname     短信模板英文名称
+     * @param phones     手机号码集合
      * @return Map<Boolean,List<String>>    TRUE:推送成功的手机号码集合；
      *                                      FALSE:推送失败的手机号码集合
      * @throws Exception
      */
-    Map<Boolean, List<String>> sendSms(String tUname, List<String> phones, Map<String, String> contentParams) throws BusinessCheckException;
+    Map<Boolean, List<String>> sendSms(Integer merchantId, String tUname, List<String> phones, Map<String, String> contentParams) throws BusinessCheckException;
 
     /**
      * 分页已发短信列表

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

@@ -21,14 +21,14 @@ public interface SourceService extends IService<TSource> {
      *
      * @return
      */
-    List<TSource> getAvailableSources();
+    List<TSource> getAvailableSources(Integer merchantId);
 
     /**
      * 获取菜单的属性结构
      *
      * @return
      */
-    List<TreeNode> getSourceTree();
+    List<TreeNode> getSourceTree(Integer merchantId);
 
     /**
      * 根据菜单ID集合查询菜单列表信息

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

@@ -43,10 +43,12 @@ public interface UserGradeService extends IService<MtUserGrade> {
     /**
      * 根据ID获取会员等级信息
      *
-     * @param  id ID
+     * @param merchantId
+     * @param gradeId ID
+     * @param userId
      * @throws BusinessCheckException
      */
-    MtUserGrade queryUserGradeById(Integer id, Integer userId) throws BusinessCheckException;
+    MtUserGrade queryUserGradeById(Integer merchantId, Integer gradeId, Integer userId) throws BusinessCheckException;
 
     /**
      * 根据ID删除会员等级
@@ -60,12 +62,14 @@ public interface UserGradeService extends IService<MtUserGrade> {
     /**
      * 获取默认的会员等级
      *
+     * @param merchantId
      * @throws BusinessCheckException
      */
-    MtUserGrade getInitUserGrade() throws BusinessCheckException;
+    MtUserGrade getInitUserGrade(Integer merchantId) throws BusinessCheckException;
 
     /**
      * 获取付费会员等级列表
+     *
      * @param  userInfo
      * @throws BusinessCheckException
      * */

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

@@ -465,6 +465,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
 
                 // 发放记录
                 ReqSendLogDto dto = new ReqSendLogDto();
+                dto.setMerchantId(cellDto.getMerchantId());
                 dto.setType(2);
                 dto.setMobile(cellDto.getMobile());
                 dto.setUserId(mtUser.getId());
@@ -485,7 +486,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
                     Map<String, String> params = new HashMap<>();
                     params.put("totalNum", totalNum+"");
                     params.put("totalMoney", totalMoney+"");
-                    sendSmsService.sendSms("received-coupon", mobileList, params);
+                    sendSmsService.sendSms(cellDto.getMerchantId(), "received-coupon", mobileList, params);
                 } catch (Exception e) {
                     //empty
                 }

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

@@ -749,7 +749,7 @@ public class CouponServiceImpl extends ServiceImpl<MtCouponMapper, MtCoupon> imp
                 params.put("storeName", mtStore.getName());
             }
             params.put("sn", code.toString());
-            sendSmsService.sendSms("confirm-coupon", mobileList, params);
+            sendSmsService.sendSms(couponInfo.getMerchantId(), "confirm-coupon", mobileList, params);
 
             // 发送小程序订阅消息
             Date nowTime = new Date();

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

@@ -46,8 +46,8 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
     private TDutySourceMapper tDutySourceMapper;
 
     @Override
-    public List<TDuty> getAvailableRoles() {
-        List<TDuty> result = tDutyMapper.findByStatus(StatusEnum.ENABLED.getKey());
+    public List<TDuty> getAvailableRoles(Integer merchantId) {
+        List<TDuty> result = tDutyMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
         return result;
     }
 
@@ -122,7 +122,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
             throw new BusinessCheckException("角色不存在.");
         }
         if (!StringUtil.equals(tduty.getDutyName(), existsDuty.getDutyName())) {
-            TDuty tDuty = this.findByName(tduty.getDutyName());
+            TDuty tDuty = findByName(existsDuty.getMerchantId(), tduty.getDutyName());
             if (tDuty != null) {
                 throw new BusinessCheckException("角色名已存在.");
             }
@@ -149,11 +149,12 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
     /**
      * 根据角色名称合状态查询角色
      *
+     * @param merchantId
      * @param name
      * @return
      */
     @Override
-    public TDuty findByName(String name) {
+    public TDuty findByName(Integer merchantId, String name) {
         return this.tDutyMapper.findByName(name);
     }
 
@@ -210,6 +211,10 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(TDuty::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(TDuty::getMerchantId, merchantId);
+        }
 
         lambdaQueryWrapper.orderByDesc(TDuty::getDutyId);
         List<TDuty> dataList = tDutyMapper.selectList(lambdaQueryWrapper);
@@ -227,11 +232,12 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
     /**
      * 获取菜单的属性结构
      *
+     * @param merchantId 商户ID
      * @return
      */
     @Override
-    public List<TreeNode> getDutyTree() {
-        List<TDuty> tDuties = this.getAvailableRoles();
+    public List<TreeNode> getDutyTree(Integer merchantId) {
+        List<TDuty> tDuties = getAvailableRoles(merchantId);
         List<TreeNode> trees = new ArrayList<TreeNode>();
         if (tDuties != null && tDuties.size() > 0) {
             TreeNode sourceTreeNode;

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

@@ -169,7 +169,7 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
             userInfo.setMerchantId(merchantId);
             userInfo.setName(mobile);
             userInfo.setMobile(mobile);
-            MtUserGrade grade = userGradeService.getInitUserGrade();
+            MtUserGrade grade = userGradeService.getInitUserGrade(merchantId);
             userInfo.setGradeId(grade.getId()+"");
             userInfo.setBalance(new BigDecimal(0));
             userInfo.setStatus(StatusEnum.ENABLED.getKey());
@@ -279,7 +279,7 @@ public class GiveServiceImpl extends ServiceImpl<MtGiveMapper, MtGive> implement
             Map<String, String> params = new HashMap<>();
             params.put("totalNum", couponIds.length+"");
             params.put("totalMoney", money+"");
-            sendSmsService.sendSms("received-coupon", mobileList, params);
+            sendSmsService.sendSms(merchantId, "received-coupon", mobileList, params);
         } catch (Exception e) {
             //empty
         }

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

@@ -281,7 +281,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
                 }
             }
             if (userDto.getGradeId() != null) {
-                MtUserGrade mtGrade = userGradeService.queryUserGradeById(Integer.parseInt(userDto.getGradeId()), user.getId());
+                MtUserGrade mtGrade = userGradeService.queryUserGradeById(Integer.parseInt(merchantId), Integer.parseInt(userDto.getGradeId()), user.getId());
                 if (mtGrade != null) {
                     userDto.setGradeName(mtGrade.getName());
                 }
@@ -325,7 +325,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         }
         // 默认会员等级
         if (StringUtil.isEmpty(mtUser.getGradeId())) {
-            MtUserGrade grade = userGradeService.getInitUserGrade();
+            MtUserGrade grade = userGradeService.getInitUserGrade(mtUser.getMerchantId());
             if (grade != null) {
                 mtUser.setGradeId(grade.getId().toString());
             }
@@ -380,7 +380,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
             // 短信模板
             try {
                 Map<String, String> params = new HashMap<>();
-                sendSmsService.sendSms("register-sms", mobileList, params);
+                sendSmsService.sendSms(mtUser.getMerchantId(), "register-sms", mobileList, params);
             } catch (BusinessCheckException e) {
                 // empty
             }
@@ -447,7 +447,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         String nickName = mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2");
         mtUser.setName(nickName);
         mtUser.setMobile(mobile);
-        MtUserGrade grade = userGradeService.getInitUserGrade();
+        MtUserGrade grade = userGradeService.getInitUserGrade(merchantId);
         if (grade != null) {
             mtUser.setGradeId(grade.getId() + "");
         }
@@ -522,7 +522,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
 
         if (mtUser != null) {
             // 检查会员是否过期，过期就把会员等级置为初始等级
-            MtUserGrade initGrade = userGradeService.getInitUserGrade();
+            MtUserGrade initGrade = userGradeService.getInitUserGrade(mtUser.getMerchantId());
             if (initGrade != null) {
                 Date endTime = mtUser.getEndTime();
                 if (endTime != null) {
@@ -542,7 +542,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
                     openGiftService.openGift(mtUser.getId(), initGrade.getId(), false);
                 } else {
                     // 会员等级不存在或已禁用、删除，就把会员等级置为初始等级
-                    MtUserGrade myGrade = userGradeService.queryUserGradeById(Integer.parseInt(userGradeId), id);
+                    MtUserGrade myGrade = userGradeService.queryUserGradeById(mtUser.getMerchantId(), Integer.parseInt(userGradeId), id);
                     if (myGrade == null || !myGrade.getStatus().equals(StatusEnum.ENABLED.getKey())) {
                         mtUser.setGradeId(initGrade.getId().toString());
                         updateById(mtUser);
@@ -606,6 +606,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
             if (StringUtil.isEmpty(nickName) && StringUtil.isNotEmpty(mobile)) {
                 nickName = mobile.replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2");
             }
+            mtUser.setMerchantId(merchantId);
             String userNo = CommonUtil.createUserNo();
             mobile = CommonUtil.replaceXSS(mobile);
             avatar = CommonUtil.replaceXSS(avatar);
@@ -615,7 +616,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
             mtUser.setAvatar(avatar);
             mtUser.setName(nickName);
             mtUser.setOpenId(openId);
-            MtUserGrade grade = userGradeService.getInitUserGrade();
+            MtUserGrade grade = userGradeService.getInitUserGrade(merchantId);
             if (grade != null) {
                 mtUser.setGradeId(grade.getId() + "");
             }

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

@@ -76,7 +76,10 @@ public class OpenGiftServiceImpl extends ServiceImpl<MtOpenGiftMapper, MtOpenGif
         Page<MtOpenGift> pageHelper = PageHelper.startPage(pageNumber, pageSize);
         LambdaQueryWrapper<MtOpenGift> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtOpenGift::getStatus, StatusEnum.DISABLE.getKey());
-
+        String merchantId = paramMap.get("merchantId") == null ? "" : paramMap.get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtOpenGift::getMerchantId, merchantId);
+        }
         String couponId = paramMap.get("couponId") == null ? "" : paramMap.get("couponId").toString();
         if (StringUtils.isNotBlank(couponId)) {
             lambdaQueryWrapper.eq(MtOpenGift::getCouponId, couponId);
@@ -225,8 +228,8 @@ public class OpenGiftServiceImpl extends ServiceImpl<MtOpenGiftMapper, MtOpenGif
         if (user.getGradeId() == null && StringUtil.isEmpty(user.getGradeId())) {
             user.setGradeId("0");
         }
-        MtUserGrade oldGrade = userGradeService.queryUserGradeById(Integer.parseInt(user.getGradeId()), user.getId());
-        MtUserGrade gradeInfo = userGradeService.queryUserGradeById(gradeId, user.getId());
+        MtUserGrade oldGrade = userGradeService.queryUserGradeById(user.getMerchantId(), Integer.parseInt(user.getGradeId()), user.getId());
+        MtUserGrade gradeInfo = userGradeService.queryUserGradeById(user.getMerchantId(), gradeId, user.getId());
         // 设置有效期
         if (gradeInfo.getValidDay() > 0) {
             user.setStartTime(new Date());
@@ -317,7 +320,7 @@ public class OpenGiftServiceImpl extends ServiceImpl<MtOpenGiftMapper, MtOpenGif
         MtCoupon couponInfo = couponService.queryCouponById(openGiftInfo.getCouponId());
         dto.setCouponInfo(couponInfo);
 
-        MtUserGrade gradeInfo = userGradeService.queryUserGradeById(openGiftInfo.getGradeId(), 0);
+        MtUserGrade gradeInfo = userGradeService.queryUserGradeById(openGiftInfo.getMerchantId(), openGiftInfo.getGradeId(), 0);
         dto.setGradeInfo(gradeInfo);
 
         return dto;

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

@@ -298,7 +298,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
         // 会员相关信息
         MtUser userInfo = memberService.queryMemberById(orderDto.getUserId());
-        MtUserGrade userGrade = userGradeService.queryUserGradeById(userInfo.getGradeId() != null ? Integer.parseInt(userInfo.getGradeId()) : 1, orderDto.getUserId());
+        MtUserGrade userGrade = userGradeService.queryUserGradeById(orderDto.getMerchantId(), userInfo.getGradeId() != null ? Integer.parseInt(userInfo.getGradeId()) : 1, orderDto.getUserId());
         BigDecimal percent = new BigDecimal("0");
         if (userGrade != null && userGrade.getDiscount() != null && userGrade.getDiscount() > 0) {
             // 会员折扣
@@ -801,7 +801,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                 params.put("orderSn", mtOrder.getOrderSn());
                 List<String> mobileList = new ArrayList<>();
                 mobileList.add(mtStore.getPhone());
-                sendSmsService.sendSms("new-order", mobileList, params);
+                sendSmsService.sendSms(mtOrder.getMerchantId(), "new-order", mobileList, params);
             }
         } catch (Exception e) {
             // empty

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

@@ -173,7 +173,7 @@ public class PaymentServiceImpl implements PaymentService {
             logger.info("PaymentService paymentCallback Point orderSn = {} , pointNum ={}", orderInfo.getOrderSn(), pointNum);
             if (pointNum > 0) {
                 MtUser userInfo = memberService.queryMemberById(orderInfo.getUserId());
-                MtUserGrade userGrade = userGradeService.queryUserGradeById(Integer.parseInt(userInfo.getGradeId()), orderInfo.getUserId());
+                MtUserGrade userGrade = userGradeService.queryUserGradeById(orderInfo.getMerchantId(), Integer.parseInt(userInfo.getGradeId()), orderInfo.getUserId());
                 // 是否会员积分加倍
                 if (userGrade.getSpeedPoint() > 1) {
                     pointNum = pointNum * userGrade.getSpeedPoint();
@@ -197,7 +197,7 @@ public class PaymentServiceImpl implements PaymentService {
                     MtUser mtUser = memberService.queryMemberById(orderInfo.getUserId());
                     MtUserGrade mtUserGrade = mtUserGradeMapper.selectById(mtUser.getGradeId());
                     if (mtUserGrade == null) {
-                        mtUserGrade = userGradeService.getInitUserGrade();
+                        mtUserGrade = userGradeService.getInitUserGrade(orderInfo.getMerchantId());
                     }
                     List<MtUserGrade> userGradeList = mtUserGradeMapper.selectByMap(param);
                     if (mtUserGrade != null && userGradeList != null && userGradeList.size() > 0) {

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

@@ -102,7 +102,7 @@ public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> imp
     /**
      * 分页查询售后订单列表
      *
-     * @param  paginationRequest
+     * @param paginationRequest
      * @return
      */
     @Override
@@ -110,7 +110,10 @@ public class RefundServiceImpl extends ServiceImpl<MtRefundMapper, MtRefund> imp
         Page<MtBanner> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtRefund> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtRefund::getStatus, StatusEnum.DISABLE.getKey());
-
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtRefund::getMerchantId, merchantId);
+        }
         String remark = paginationRequest.getSearchParams().get("remark") == null ? "" : paginationRequest.getSearchParams().get("remark").toString();
         if (StringUtils.isNotBlank(remark)) {
             lambdaQueryWrapper.like(MtRefund::getRemark, remark);

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

@@ -59,7 +59,7 @@ public class SendSmsServiceImpl implements SendSmsService {
      private SmsTemplateService smsTemplateService;
 
     @Override
-    public Map<Boolean,List<String>> sendSms(String templateUname, List<String> phones, Map<String, String> contentParams) throws BusinessCheckException {
+    public Map<Boolean,List<String>> sendSms(Integer merchantId, String templateUname, List<String> phones, Map<String, String> contentParams) throws BusinessCheckException {
         logger.info("使用短信平台发送短信.....");
         Integer mode = Integer.parseInt(env.getProperty("aliyun.sms.mode"));
         if (mode.intValue() != 1) {
@@ -72,7 +72,7 @@ public class SendSmsServiceImpl implements SendSmsService {
                 if (mode != null && mode.intValue() == 1) {
                     // 手机号以","分隔拼接
                     String mobilePhones = phones.stream().collect(Collectors.joining(","));
-                    MessageResDto res = sendMessage(mobilePhones, templateUname, contentParams);
+                    MessageResDto res = sendMessage(merchantId, mobilePhones, templateUname, contentParams);
                     result.put(res.getResult(), phones);
                 } else {
                     result.put(Boolean.TRUE,phones);
@@ -96,7 +96,7 @@ public class SendSmsServiceImpl implements SendSmsService {
      * @param templateUname   短信模板英文名称
      * @return
      */
-    public MessageResDto sendMessage(String phoneNo, String templateUname, Map<String, String> contentParams) {
+    public MessageResDto sendMessage(Integer merchantId, String phoneNo, String templateUname, Map<String, String> contentParams) {
         MessageResDto resInfo = new MessageResDto();
         logger.info("sendMessage inParams:phoneNo={}, message={}", phoneNo, templateUname);
         if (StringUtil.isBlank(phoneNo) || phoneNo.split(",").length > 200) {
@@ -113,6 +113,7 @@ public class SendSmsServiceImpl implements SendSmsService {
         try {
             Map<String, Object> params = new HashMap<>();
             params.put("uname", templateUname);
+            params.put("merchant_id", merchantId);
             List<MtSmsTemplate> templateList = smsTemplateService.querySmsTemplateByParams(params);
             if (templateList.size() < 1) {
                 throw new BusinessCheckException("该短信模板不存在！");
@@ -177,7 +178,7 @@ public class SendSmsServiceImpl implements SendSmsService {
                 e.printStackTrace();
             }
             logger.info("sendMessage outParams:{}", res);
-            saveSendLog(phoneNo, smsContent);
+            saveSendLog(merchantId, phoneNo, smsContent);
             flag = true;
         } catch (Exception e) {
             flag = false;
@@ -191,12 +192,14 @@ public class SendSmsServiceImpl implements SendSmsService {
     /**
      * 发送短信日志记录
      *
-     * @param phoneNo   短信发送手机号
-     * @param message   短信内容
+     * @param merchantId 商户号
+     * @param phoneNo    短信发送手机号
+     * @param message    短信内容
      * @return
      */
-    public void saveSendLog(String phoneNo, String message) {
+    public void saveSendLog(Integer merchantId, String phoneNo, String message) {
         MtSmsSendedLog mtSmsSendedLog = new MtSmsSendedLog();
+        mtSmsSendedLog.setMerchantId(merchantId);
         mtSmsSendedLog.setMobilePhone(phoneNo);
         mtSmsSendedLog.setContent(message);
         Date time = new Date();
@@ -216,7 +219,10 @@ public class SendSmsServiceImpl implements SendSmsService {
     public PaginationResponse<MtSmsSendedLog> querySmsListByPagination(PaginationRequest paginationRequest) {
         Page<MtSmsSendedLog> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtSmsSendedLog> lambdaQueryWrapper = Wrappers.lambdaQuery();
-
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtSmsSendedLog::getMerchantId, merchantId);
+        }
         String content = paginationRequest.getSearchParams().get("content") == null ? "" : paginationRequest.getSearchParams().get("content").toString();
         if (StringUtils.isNotBlank(content)) {
             lambdaQueryWrapper.like(MtSmsSendedLog::getContent, content);

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

@@ -283,7 +283,7 @@ public class SettlementServiceImpl implements SettlementService {
         if (orderDto.getType().equals(OrderTypeEnum.MEMBER.getKey())) {
             orderDto.setParam(targetId.toString());
             orderDto.setCouponId(couponId);
-            MtUserGrade userGrade = userGradeService.queryUserGradeById(targetId, orderDto.getUserId());
+            MtUserGrade userGrade = userGradeService.queryUserGradeById(merchantId, targetId, orderDto.getUserId());
             if (userGrade != null) {
                 orderDto.setRemark("付费升级" + userGrade.getName());
                 orderDto.setAmount(new BigDecimal(userGrade.getCatchValue().toString()));

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

@@ -49,6 +49,10 @@ public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtS
         LambdaQueryWrapper<MtSmsTemplate> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtSmsTemplate::getStatus, StatusEnum.DISABLE.getKey());
 
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.like(MtSmsTemplate::getMerchantId, merchantId);
+        }
         String name = paginationRequest.getSearchParams().get("name") == null ? "" : paginationRequest.getSearchParams().get("name").toString();
         if (StringUtils.isNotBlank(name)) {
             lambdaQueryWrapper.like(MtSmsTemplate::getName, name);
@@ -89,7 +93,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtS
     @OperationServiceLog(description = "保存短信模板")
     public MtSmsTemplate saveSmsTemplate(SmsTemplateDto mtSmsTemplateDto) {
         MtSmsTemplate mtSmsTemplate = new MtSmsTemplate();
-
+        mtSmsTemplate.setMerchantId(mtSmsTemplateDto.getMerchantId());
         mtSmsTemplate.setCode(mtSmsTemplateDto.getCode());
         mtSmsTemplate.setName(mtSmsTemplateDto.getName());
         mtSmsTemplate.setUname(mtSmsTemplateDto.getUname());

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

@@ -2,6 +2,7 @@ package com.fuint.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.domain.TreeSelect;
+import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.SourceService;
 import com.fuint.common.vo.MetaVo;
 import com.fuint.common.vo.RouterVo;
@@ -37,8 +38,8 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
      * @return
      */
     @Override
-    public List<TSource> getAvailableSources() {
-        return tSourceMapper.findByStatus("A");
+    public List<TSource> getAvailableSources(Integer merchantId) {
+        return tSourceMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
     }
 
     /**
@@ -47,8 +48,8 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
      * @return
      */
     @Override
-    public List<TreeNode> getSourceTree() {
-        List<TSource> tSources = this.getAvailableSources();
+    public List<TreeNode> getSourceTree(Integer merchantId) {
+        List<TSource> tSources = getAvailableSources(merchantId);
         List<TreeNode> trees = new ArrayList<>();
         if (tSources != null && tSources.size() > 0) {
             TreeNode sourceTreeNode = null;

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

@@ -193,7 +193,7 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
                 Map<String, String> params = new HashMap<>();
                 params.put("name", mtStaff.getRealName());
                 params.put("storeId", mtStaff.getStoreId().toString());
-                sendSmsService.sendSms("confirmer-authed", mobileList, params);
+                sendSmsService.sendSms(mtStaff.getMerchantId(), "confirmer-authed", mobileList, params);
             } catch (Exception e) {
                 // empty
             }

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

@@ -65,6 +65,10 @@ public class StockServiceImpl extends ServiceImpl<MtStockMapper, MtStock> implem
         if (StringUtils.isNotBlank(type)) {
             lambdaQueryWrapper.eq(MtStock::getType, type);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtStock::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtStock::getStoreId, storeId);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.UserGradeCatchTypeEnum;
+import com.fuint.common.service.MemberService;
 import com.fuint.common.service.UserGradeService;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -44,6 +45,9 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
     @Resource
     private MtStaffMapper mtStaffMapper;
 
+    @Resource
+    private MemberService memberService;
+
     /**
      * 分页查询会员等级列表
      *
@@ -108,12 +112,13 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
     /**
      * 根据ID获取会员等级信息
      *
-     * @param id 会员等级ID
+     * @param merchantId
+     * @param gradeId 会员等级ID
      * @param userId 会员ID
      * @return
      */
     @Override
-    public MtUserGrade queryUserGradeById(Integer id, Integer userId) {
+    public MtUserGrade queryUserGradeById(Integer merchantId, Integer gradeId, Integer userId) {
         if (userId != null && userId > 0) {
             Map<String, Object> params = new HashMap<>();
             params.put("AUDITED_STATUS", StatusEnum.ENABLED.getKey());
@@ -121,10 +126,10 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
             List<MtStaff> staffList = mtStaffMapper.selectByMap(params);
             // 如果是员工关联的会员，就返回默认的会员等级
             if (staffList != null && staffList.size() > 0) {
-                return getInitUserGrade();
+                return getInitUserGrade(merchantId);
             }
         }
-        return mtUserGradeMapper.selectById(id);
+        return mtUserGradeMapper.selectById(gradeId);
     }
 
     /**
@@ -159,7 +164,7 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "删除会员等级")
     public Integer deleteUserGrade(Integer id, String operator) {
-        MtUserGrade mtUserGrade = queryUserGradeById(id, 0);
+        MtUserGrade mtUserGrade = queryUserGradeById(0, id, 0);
         if (null == mtUserGrade) {
             return 0;
         }
@@ -170,23 +175,31 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
 
     /**
      * 获取默认的会员等级
+     *
+     * @param merchantId
+     * @return
      */
     @Override
-    public MtUserGrade getInitUserGrade() {
+    public MtUserGrade getInitUserGrade(Integer merchantId) {
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());
         param.put("CATCH_TYPE", UserGradeCatchTypeEnum.INIT.getKey());
+        param.put("MERCHANT_ID", merchantId);
+
         List<MtUserGrade> dataList = mtUserGradeMapper.selectByMap(param);
-        MtUserGrade initGrade = new MtUserGrade();
-        initGrade.setId(0);
+        MtUserGrade initGrade;
         if (dataList != null && dataList.size() > 0) {
             initGrade = dataList.get(0);
+        } else {
+            initGrade = new MtUserGrade();
+            initGrade.setId(0);
         }
         return initGrade;
     }
 
     /**
      * 获取付费会员等级列表
+     *
      * @param userInfo
      * */
     @Override
@@ -194,6 +207,7 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());
         param.put("catch_type", UserGradeCatchTypeEnum.PAY.getKey());
+        param.put("merchant_id", userInfo.getMerchantId());
         List<MtUserGrade> userGrades = mtUserGradeMapper.selectByMap(param);
         List<MtUserGrade> dataList = new ArrayList<>();
         if (userGrades.size() > 0 && userInfo != null) {

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

@@ -134,7 +134,7 @@ public class BackendAccountController extends BaseController {
         }
         Map<String, Object> result = new HashMap<>();
 
-        List<TDuty> roleList = tDutyService.getAvailableRoles();
+        List<TDuty> roleList = tDutyService.getAvailableRoles(accountInfo.getMerchantId());
         List<RoleDto> roles = new ArrayList<>();
         if (roleList.size() > 0) {
             for (TDuty duty : roleList) {

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

@@ -256,6 +256,7 @@ public class BackendBalanceController extends BaseController {
         }
 
         MtSetting setting = new MtSetting();
+        setting.setMerchantId(accountInfo.getMerchantId());
         setting.setType(SettingTypeEnum.BALANCE.getKey());
         setting.setName(BalanceSettingEnum.RECHARGE_RULE.getKey());
         setting.setValue(rechargeRule);
@@ -267,6 +268,7 @@ public class BackendBalanceController extends BaseController {
 
         // 保存充值说明
         MtSetting settingRemark = new MtSetting();
+        settingRemark.setMerchantId(accountInfo.getMerchantId());
         settingRemark.setType(SettingTypeEnum.BALANCE.getKey());
         settingRemark.setName(BalanceSettingEnum.RECHARGE_REMARK.getKey());
         settingRemark.setValue(remark);

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

@@ -84,6 +84,9 @@ public class BackendBannerController extends BaseController {
         paginationRequest.setPageSize(pageSize);
 
         Map<String, Object> params = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(title)) {
             params.put("title", title);
         }

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

@@ -129,6 +129,9 @@ public class BackendCashierController extends BaseController {
         }
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            param.put("merchantId", accountInfo.getMerchantId());
+        }
         if (storeId > 0) {
             param.put("storeId", storeId);
         }

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

@@ -466,6 +466,7 @@ public class BackendCouponController extends BaseController {
 
         // 发放记录
         ReqSendLogDto dto = new ReqSendLogDto();
+        dto.setMerchantId(couponInfo.getMerchantId());
         dto.setType(1);
         dto.setMobile(mobile);
         dto.setUserId(mtUser.getId());
@@ -498,7 +499,7 @@ public class BackendCouponController extends BaseController {
             Map<String, String> params = new HashMap<>();
             params.put("totalNum", totalNum+"");
             params.put("totalMoney", totalMoney+"");
-            sendSmsService.sendSms("received-coupon", mobileList, params);
+            sendSmsService.sendSms(couponInfo.getMerchantId(), "received-coupon", mobileList, params);
         } catch (Exception e) {
             //empty
         }

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

@@ -59,11 +59,17 @@ public class BackendDutyController extends BaseController {
     @RequestMapping(value = "/list")
     @CrossOrigin
     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 name = request.getParameter("name") == null ? "" : request.getParameter("name");
         String status = request.getParameter("status") == null ? "" : request.getParameter("status");
 
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);
         paginationRequest.setPageSize(pageSize);
@@ -75,6 +81,9 @@ public class BackendDutyController extends BaseController {
         if (StringUtil.isNotEmpty(status)) {
             searchParams.put("status", status);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
 
         paginationRequest.setSearchParams(searchParams);
         PaginationResponse<TDuty> paginationResponse = tDutyService.findDutiesByPagination(paginationRequest);
@@ -136,6 +145,7 @@ public class BackendDutyController extends BaseController {
         }
 
         TDuty tDuty = new TDuty();
+        tDuty.setMerchantId(accountInfo.getMerchantId());
         tDuty.setDutyName(name);
         tDuty.setDutyType(type);
         tDuty.setStatus(status);
@@ -171,6 +181,7 @@ public class BackendDutyController extends BaseController {
         Map<String, Object> result = new HashMap<>();
 
         RoleDto roleInfo = new RoleDto();
+        roleInfo.setMerchantId(htDuty.getMerchantId());
         roleInfo.setId(htDuty.getDutyId().longValue());
         roleInfo.setName(htDuty.getDutyName());
         roleInfo.setType(htDuty.getDutyType());
@@ -218,6 +229,7 @@ public class BackendDutyController extends BaseController {
         duty.setDutyName(name);
         duty.setStatus(status);
         duty.setDutyType(type);
+        duty.setMerchantId(accountInfo.getMerchantId());
 
         // 获取角色所分配的菜单
         List<TSource> sources = null;

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

@@ -740,7 +740,7 @@ public class BackendGoodsController extends BaseController {
     /**
      * 删除商品规格值
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      */
     @ApiOperation(value = "删除商品规格值")
     @RequestMapping(value = "/deleteSpecValue", method = RequestMethod.GET)

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

@@ -398,7 +398,7 @@ public class BackendMemberController extends BaseController {
             info.setOperator(operator);
             info.setUpdateTime(new Date());
             info.setMerchantId(accountInfo.getMerchantId());
-            info.setStoreId(accountInfo.getStoreId());
+            info.setStoreId(0);
 
             settingService.saveSetting(info);
         }

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

@@ -49,13 +49,19 @@ public class BackendOpenGiftController extends BaseController {
     /**
      * 开卡赠礼列表查询
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      */
     @ApiOperation(value = "开卡赠礼列表查询")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @CrossOrigin
     public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
         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 couponId = request.getParameter("couponId");
@@ -63,6 +69,9 @@ public class BackendOpenGiftController extends BaseController {
         String status = request.getParameter("status");
 
         Map<String, Object> param = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            param.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(couponId)) {
             param.put("couponId", couponId);
         }
@@ -117,7 +126,7 @@ public class BackendOpenGiftController extends BaseController {
     /**
      * 提交开卡赠礼
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      */
     @ApiOperation(value = "提交开卡赠礼")
@@ -166,6 +175,7 @@ public class BackendOpenGiftController extends BaseController {
         } else {
             reqDto.setPoint(0);
         }
+        reqDto.setMerchantId(accountInfo.getMerchantId());
         reqDto.setStoreId(0);
         reqDto.setStatus(status);
         String operator = accountInfo.getAccountName();

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

@@ -198,6 +198,8 @@ public class BackendPointController extends BaseController {
         PointSettingEnum[] settingList = PointSettingEnum.values();
         for (PointSettingEnum setting : settingList) {
             MtSetting info = new MtSetting();
+            info.setMerchantId(accountInfo.getMerchantId());
+            info.setStoreId(0);
             info.setType(SettingTypeEnum.POINT.getKey());
             info.setName(setting.getKey());
 

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

@@ -61,6 +61,9 @@ public class BackendSmsTemplateController extends BaseController {
         }
 
         Map<String, Object> searchParams = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(code)) {
             searchParams.put("code", code);
         }
@@ -94,7 +97,7 @@ public class BackendSmsTemplateController extends BaseController {
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-
+        smsTemplateDto.setMerchantId(accountInfo.getMerchantId());
         smsTemplateService.saveSmsTemplate(smsTemplateDto);
         return getSuccessResult(true);
     }

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

@@ -2,10 +2,12 @@ package com.fuint.module.backendApi.controller;
 
 import com.fuint.common.domain.TreeNode;
 import com.fuint.common.domain.TreeSelect;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.SourceDto;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.SourceService;
 import com.fuint.common.util.CommonUtil;
+import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
@@ -47,8 +49,14 @@ public class BackendSourceController extends BaseController {
      */
     @ApiOperation(value = "获取菜单列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public ResponseObject list() {
-        List<TreeNode> sources = sSourceService.getSourceTree();
+    public ResponseObject list(HttpServletRequest request) {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
+        List<TreeNode> sources = sSourceService.getSourceTree(accountInfo.getMerchantId());
         return getSuccessResult(sources);
     }
 
@@ -69,6 +77,7 @@ public class BackendSourceController extends BaseController {
         if (tSource.getParentId() != null) {
             sourceDto.setParentId(tSource.getParentId());
         }
+        sourceDto.setMerchantId(tSource.getMerchantId());
         sourceDto.setPath(tSource.getPath());
         sourceDto.setIcon(tSource.getNewIcon());
         sourceDto.setNewIcon(tSource.getNewIcon());
@@ -90,7 +99,13 @@ public class BackendSourceController extends BaseController {
      */
     @ApiOperation(value = "新增菜单")
     @RequestMapping(value = "/add", method = RequestMethod.POST)
-    public ResponseObject addSource(@RequestBody Map<String, Object> param) {
+    public ResponseObject addSource(HttpServletRequest request, @RequestBody Map<String, Object> param) {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
         String name = param.get("name").toString();
         String status = param.get("status").toString();
         String parentId = param.get("parentId").toString();
@@ -101,6 +116,7 @@ public class BackendSourceController extends BaseController {
 
         TSource addSource = new TSource();
         addSource.setSourceName(name);
+        addSource.setMerchantId(accountInfo.getMerchantId());
         addSource.setStatus(status);
         addSource.setNewIcon(icon);
         addSource.setIsLog(1);
@@ -143,7 +159,13 @@ public class BackendSourceController extends BaseController {
      */
     @ApiOperation(value = "修改菜单")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
-    public ResponseObject update(@RequestBody Map<String, Object> param) {
+    public ResponseObject update(HttpServletRequest request, @RequestBody Map<String, Object> param) {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
+
         String name = param.get("name").toString();
         String status = param.get("status").toString();
         String parentId = param.get("parentId").toString();
@@ -162,6 +184,7 @@ public class BackendSourceController extends BaseController {
         editSource.setSourceStyle(sort);
         editSource.setIsMenu(isMenu);
         editSource.setSourceCode(editSource.getPath());
+        editSource.setMerchantId(accountInfo.getMerchantId());
 
         String eName = "";
         String[] paths = path.split("/");
@@ -203,8 +226,9 @@ public class BackendSourceController extends BaseController {
     @RequestMapping(value = "/delete/{sourceId}", method = RequestMethod.GET)
     public ResponseObject delete(HttpServletRequest request, @PathVariable("sourceId") Long sourceId) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        if (StringUtil.isEmpty(token)) {
-            return getFailureResult(201,"请求参数有误");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
         }
 
         try {
@@ -225,11 +249,12 @@ public class BackendSourceController extends BaseController {
     @RequestMapping(value = "/treeselect", method = RequestMethod.GET)
     public ResponseObject treeselect(HttpServletRequest request) {
         String token = request.getHeader("Access-Token");
-        if (StringUtil.isEmpty(token)) {
-            return getFailureResult(201,"请求参数有误");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
         }
 
-        List<TreeNode> sources = sSourceService.getSourceTree();
+        List<TreeNode> sources = sSourceService.getSourceTree(accountInfo.getMerchantId());
         List<TreeSelect> data = sourceService.buildMenuTreeSelect(sources);
 
         return getSuccessResult(data);

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

@@ -107,6 +107,9 @@ public class BackendStockController extends BaseController {
         if (StringUtil.isNotEmpty(type)) {
             params.put("type", type);
         }
+        if (account.getMerchantId() != null && account.getMerchantId() > 0) {
+            params.put("merchantId", account.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(searchStoreId)) {
             params.put("storeId", searchStoreId);
         }

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

@@ -87,6 +87,9 @@ public class BackendStoreController extends BaseController {
         paginationRequest.setPageSize(pageSize);
 
         Map<String, Object> params = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(storeId)) {
             params.put("storeId", storeId);
         }

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

@@ -189,7 +189,7 @@ public class BackendSubMessageController extends BaseController {
     /**
      * 保存订阅消息模板
      *
-     * @param request  HttpServletRequest对象
+     * @param request HttpServletRequest对象
      * @return
      */
     @ApiOperation(value = "保存订阅消息模板")
@@ -244,10 +244,12 @@ public class BackendSubMessageController extends BaseController {
             // 保存配置
             settingService.removeSetting(accountInfo.getMerchantId(), key);
             MtSetting info = new MtSetting();
+            info.setMerchantId(accountInfo.getMerchantId());
             info.setType(SettingTypeEnum.SUB_MESSAGE.getKey());
             info.setName(key);
             info.setValue(json);
-
+            info.setMerchantId(accountInfo.getMerchantId());
+            info.setStoreId(0);
             String description = WxMessageEnum.getValue(key);
             info.setDescription(description);
             info.setOperator(accountInfo.getAccountName());

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

@@ -123,11 +123,16 @@ public class BackendUserGradeController extends BaseController {
     @ApiOperation(value = "更新会员等级状态")
     @RequestMapping(value = "/updateStatus", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject updateStatus(@RequestBody Map<String, Object> param) throws BusinessCheckException {
+    public ResponseObject updateStatus(HttpServletRequest request, @RequestBody Map<String, Object> param) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        if (accountInfo == null) {
+            return getFailureResult(1001, "请先登录");
+        }
         Integer userGradeId = param.get("userGradeId") == null ? 0 : Integer.parseInt(param.get("userGradeId").toString());
         String status = param.get("status") == null ? StatusEnum.ENABLED.getKey() : param.get("status").toString();
 
-        MtUserGrade gradeInfo = userGradeService.queryUserGradeById(userGradeId, 0);
+        MtUserGrade gradeInfo = userGradeService.queryUserGradeById(accountInfo.getMerchantId(), userGradeId, 0);
         if (gradeInfo == null) {
             return getFailureResult(201, "会员等级不存在");
         }
@@ -204,7 +209,7 @@ public class BackendUserGradeController extends BaseController {
         if (StringUtil.isEmpty(id)) {
             info = new MtUserGrade();
         } else {
-            info = userGradeService.queryUserGradeById(Integer.parseInt(id), 0);
+            info = userGradeService.queryUserGradeById(accountInfo.getMerchantId(), Integer.parseInt(id), 0);
         }
 
         info.setGrade(Integer.parseInt(grade));
@@ -262,7 +267,7 @@ public class BackendUserGradeController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        MtUserGrade userGradeInfo = userGradeService.queryUserGradeById(id, 0);
+        MtUserGrade userGradeInfo = userGradeService.queryUserGradeById(accountInfo.getMerchantId(), id, 0);
 
         Map<String, Object> result = new HashMap<>();
         result.put("userGradeInfo", userGradeInfo);

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

@@ -94,6 +94,12 @@ public class ClientPayController extends BaseController {
     @Autowired
     UserGradeService userGradeService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 支付前查询
      * */
@@ -103,6 +109,7 @@ public class ClientPayController extends BaseController {
     public ResponseObject prePay(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String useFor = request.getParameter("type") == null ? "" : request.getParameter("type");
+        String merchantNo = request.getHeader("merchantNo");
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
         if (userInfo == null) {
             return getFailureResult(201, "请先登录");
@@ -132,8 +139,9 @@ public class ClientPayController extends BaseController {
 
         // 会员折扣
         BigDecimal payDiscount = new BigDecimal("1");
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
         if (mtUser != null) {
-            MtUserGrade userGrade = userGradeService.queryUserGradeById(Integer.parseInt(mtUser.getGradeId()), mtUser.getId());
+            MtUserGrade userGrade = userGradeService.queryUserGradeById(merchantId, Integer.parseInt(mtUser.getGradeId()), mtUser.getId());
             if (userGrade != null) {
                 if (userGrade.getDiscount() > 0) {
                     payDiscount = new BigDecimal(userGrade.getDiscount()).divide(new BigDecimal("10"), BigDecimal.ROUND_CEILING, 3);

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

@@ -1,6 +1,7 @@
 package com.fuint.module.clientApi.controller;
 
 import com.fuint.common.service.CaptchaService;
+import com.fuint.common.service.MerchantService;
 import com.fuint.common.service.SendSmsService;
 import com.fuint.common.service.VerifyCodeService;
 import com.fuint.common.util.BizCodeGenerator;
@@ -47,6 +48,12 @@ public class ClientSmsController extends BaseController {
     @Autowired
     private CaptchaService captchaService;
 
+    /**
+     * 商户服务接口
+     */
+    @Autowired
+    private MerchantService merchantService;
+
     @Autowired
     private Environment env;
 
@@ -103,11 +110,14 @@ public class ClientSmsController extends BaseController {
         List<String> mobileList = new ArrayList<>();
         mobileList.add(mobile);
 
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+
         // 短信模板
         try {
             Map<String, String> params = new HashMap<>();
             params.put("code", verifyCode);
-            result = sendSmsService.sendSms("login-code", mobileList, params);
+            result = sendSmsService.sendSms(merchantId,"login-code", mobileList, params);
             return getSuccessResult(result);
         } catch (Exception e) {
             return getFailureResult(201, e.getMessage());

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -159,7 +159,7 @@ public class MerchantMemberController extends BaseController {
                 paginationRequest.setSortColumn(new String[]{"balance desc"});
             } else if (orderBy.equals("memberTime")) {
                 paginationRequest.setSortColumn(new String[]{"endTime desc", "gradeId desc"});
-                MtUserGrade defaultGrade = userGradeService.getInitUserGrade();
+                MtUserGrade defaultGrade = userGradeService.getInitUserGrade(mtUser.getMerchantId());
                 if (defaultGrade != null) {
                     params.put("gradeId", defaultGrade.getId().toString());
                 }

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface TDutyMapper extends BaseMapper<TDuty> {
 
-    List<TDuty> findByStatus(@Param("status") String status);
+    List<TDuty> findByStatus(@Param("merchantId") Integer merchantId, @Param("status") String status);
 
     List<TDuty> findByIdIn(@Param("ids") List<Integer> ids);
 

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

@@ -17,6 +17,6 @@ public interface TSourceMapper extends BaseMapper<TSource> {
 
     List<TSource> findByIdIn(@Param("ids") List<String> ids);
 
-    List<TSource> findByStatus(String var1);
+    List<TSource> findByStatus(@Param("merchantId") Integer merchantId, @Param("status") String status);
 
 }

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

@@ -27,6 +27,9 @@ public class TDuty implements Serializable {
     @TableId(value = "duty_id", type = IdType.AUTO)
     private Integer dutyId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("角色名称")
     private String dutyName;
 

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

@@ -29,6 +29,9 @@ public class TSource implements Serializable {
     @TableId(value = "source_id", type = IdType.AUTO)
     private Integer sourceId;
 
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
     @ApiModelProperty("菜单名称")
     private String sourceName;
 

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

@@ -6,18 +6,13 @@
         <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
+        select * from mt_setting t where t.NAME = #{name}
         <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>
+        limit 1
     </select>
 </mapper>

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

@@ -4,12 +4,18 @@
 
     <select id="findByStatus" resultType="com.fuint.repository.model.TDuty">
         select * from t_duty u
-        where u.status = 'A'
+        where u.status = #{status}
+        <if test="merchantId != null and merchantId > 0">
+            and u.MERCHANT_ID = #{merchantId}
+        </if>
     </select>
 
     <select id="findByName" resultType="com.fuint.repository.model.TDuty">
         select * from t_duty u
         where u.DUTY_NAME = #{name}
+        <if test="merchantId != null and merchantId > 0">
+            and u.MERCHANT_ID = #{merchantId}
+        </if>
     </select>
 
     <select id="findByIdIn" resultType="com.fuint.repository.model.TDuty">

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

@@ -14,6 +14,9 @@
 
     <select id="findByStatus" resultType="com.fuint.repository.model.TSource">
         select * from t_source u
-        where u.status = 'A'
+        where u.status = #{status}
+        <if test="merchantId != null and merchantId > 0">
+            and u.MERCHANT_ID = #{merchantId}
+        </if>
     </select>
 </mapper>