feat(card): 添加商户用户筛选功能

- 在CardMerchantUserMapper.xml中添加商户ID条件筛选
- 为IbInfoEntity和UserInfoAddEntity添加isMerchant字段
- 为MerchantUserPageEntity添加merId字段
- 修改WasabiCardController继承BaseLoginController并添加请求参数处理
- 实现商户登录用户自动添加商户ID筛选条件

uacrd-manager-server/src/main/java/com/crm/manager/controller/WasabiCardController.java

@@ -1,5 +1,6 @@
 package com.crm.manager.controller;
 
+import com.crm.login.rely.backend.controller.BaseLoginController;
 import com.crm.manager.dto.export.*;
 import com.crm.manager.entity.excel.CardNumberExcelEntity;
 import com.crm.manager.service.CommonService;
@@ -28,6 +29,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.List;
@@ -39,7 +41,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("/wasabi")
-public class WasabiCardController {
+public class WasabiCardController extends BaseLoginController {
 
     @Autowired
     private WasabiCardFeignService wasabiCardFeignService;
@@ -51,7 +53,9 @@ public class WasabiCardController {
      * 获取卡片类型列表
      */
     @PostMapping("/card/types/page")
-    public ResultWithPagerDto<CardTypeDto> getCardTypePageList(@RequestBody CardTypePageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<CardTypeDto> getCardTypePageList(@RequestBody CardTypePageEntity entity, HttpServletRequest httpServletRequest) throws ServiceException {
+        InfoEntity infoEntity = HttpServletRequestUtil.getLoginInfo(InfoEntity.class, httpServletRequest, redisService
+                , true);
         return wasabiCardFeignService.getCardTypePageList(entity);
     }
 

ucard-cloud/src/main/java/com/crm/ucard/controller/WasabiCardController.java

@@ -1,5 +1,6 @@
 package com.crm.ucard.controller;
 
+import com.crm.login.rely.backend.controller.BaseLoginController;
 import com.crm.rely.backend.core.constant.FeignClientAnnotation;
 import com.crm.rely.backend.core.dto.base.*;
 import com.crm.rely.backend.core.dto.ucard.*;
@@ -14,6 +15,7 @@ import com.crm.rely.backend.core.entity.ucard.crypto.currency.vaultody.VaultodyR
 import com.crm.rely.backend.core.entity.wasabi.*;
 import com.crm.rely.backend.exception.ServiceException;
 import com.crm.rely.backend.util.GetIpAndMac;
+import com.crm.rely.backend.util.HttpServletRequestUtil;
 import com.crm.ucard.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +33,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/wasabi/manager")
-public class WasabiCardController {
+public class WasabiCardController extends BaseLoginController {
 
     @Autowired
     private UcardService ucardService;
@@ -81,7 +83,12 @@ public class WasabiCardController {
      */
     @PostMapping("/merchant/user/page")
     @FeignClientAnnotation
-    public ResultWithPagerDto<MerchantUserDto> getMerchantUserPageList(@RequestBody MerchantUserPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<MerchantUserDto> getMerchantUserPageList(@RequestBody MerchantUserPageEntity entity,HttpServletRequest request) throws ServiceException {
+        InfoEntity infoEntity = HttpServletRequestUtil.getLoginInfo(InfoEntity.class, request, redisService
+                , true);
+        if(infoEntity.getIbInfo().getIsMerchant() != null && infoEntity.getIbInfo().getIsMerchant() == 0){
+            entity.setMerId(infoEntity.getId());
+        }
         return ucardService.getMerchantUserPageList(entity);
     }
 

ucard-cloud/src/main/java/com/crm/ucard/service/impl/UcardServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.*;
 import com.crm.rely.backend.core.constant.Constants;
 import com.crm.rely.backend.core.dto.base.*;
 import com.crm.rely.backend.core.dto.ucard.*;
+import com.crm.rely.backend.core.entity.custom.info.InfoEntity;
 import com.crm.rely.backend.core.entity.ucard.*;
 import com.crm.rely.backend.core.pojo.table.CustomInfoTable;
 import com.crm.rely.backend.core.pojo.table.SysConfigTable;

ucard-cloud/src/main/resources/mapper/CardMerchantUserMapper.xml

@@ -23,6 +23,9 @@
         left join ucard_wallet uw on uw.c_id = um.c_id
         left join sys_country sc on sc.code = um.country
         <where>
+            <if test="merId!=null">
+                and um.`merchant_id` = #{merId}
+            </if>
             <if test="mobile!=null and mobile!=''">
                 and um.`mobile` like concat(#{mobile},'%')
             </if>
@@ -77,6 +80,9 @@
         left join ucard_wallet uw on uw.c_id = um.c_id
         left join sys_country sc on sc.code = um.country
         <where>
+            <if test="merId!=null">
+                and um.`merchant_id` = #{merId}
+            </if>
             <if test="mobile!=null and mobile!=''">
                 and um.`mobile` like concat(#{mobile},'%')
             </if>

ucard-core/src/main/java/com/crm/rely/backend/core/entity/custom/info/IbInfoEntity.java

@@ -167,4 +167,9 @@ public class IbInfoEntity {
     private Integer levelNum;
 
     private Long attachId;
+
+    /**
+     * 是否是商户 0 是 ； 1：不是
+     */
+    private Integer isMerchant;
 }

ucard-core/src/main/java/com/crm/rely/backend/core/entity/ucard/MerchantUserPageEntity.java

@@ -43,4 +43,6 @@ public class MerchantUserPageEntity extends BaseSearchPageEntity {
      */
     private Integer photoStatus;
 
+    private Long merId;
+
 }

ucard-core/src/main/java/com/crm/rely/backend/core/entity/user/info/UserInfoAddEntity.java

@@ -100,4 +100,9 @@ public class UserInfoAddEntity extends BaseAddEntity {
 
     private String groupEmail;
 
+    /**
+     * 是否是商户 0 是 ； 1：不是
+     */
+    private Integer isMerchant;
+
 }

ucard-core/src/main/java/com/crm/rely/backend/core/pojo/table/UserInfoTable.java

@@ -232,4 +232,9 @@ public class UserInfoTable extends BaseTable {
      */
     private Date resignDate;
 
+    /**
+     * 是否是商户 0 是 ； 1：不是
+     */
+    private Integer isMerchant;
+
 }