feat(card): 添加商户ID过滤功能支持多租户查询

- 在多个实体类中添加merchantId字段以支持商户隔离
- 修改Card3dsTransactionMapper.xml等数据库映射文件添加商户ID条件过滤
- 更新WasabiCardController控制器方法注入InfoEntity获取商户ID
- 修改UserInfoDao.xml等数据访问层添加商户ID查询条件
- 在UserController中添加商户ID传递逻辑
- 修改WasabiCardServiceImpl注册用户时设置商户ID

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

@@ -396,13 +396,16 @@ public class UserController extends BaseLoginController {
      * @throws Exception
      */
     @PostMapping("/search/page")
-    public BaseResultDto searchPage(@RequestBody @Validated UserInfoSearchEntity entity) throws Exception {
+    public BaseResultDto searchPage(@RequestBody @Validated UserInfoSearchEntity entity,InfoEntity infoEntity) throws Exception {
         if (entity.getEndDate() != null) {
             entity.setEndDate(DateUtil.operationDay(entity.getEndDate(), 1));
         }
         if (entity.getStartDate() != null) {
             entity.setStartDate(DateUtil.parseDate(entity.getStartDate()));
         }
+        if(infoEntity.getIbInfo().getMerchantId() != null){
+            entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
+        }
         BaseResultWithPagerDto resultWithPagerDto = userInfoService.searchPage(entity);
 
         return resultWithPagerDto;

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;
@@ -39,7 +40,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("/wasabi")
-public class WasabiCardController {
+public class WasabiCardController extends BaseLoginController {
 
     @Autowired
     private WasabiCardFeignService wasabiCardFeignService;
@@ -75,7 +76,8 @@ public class WasabiCardController {
      * 商户用户分页列表
      */
     @PostMapping("/merchant/user/page")
-    public ResultWithPagerDto<MerchantUserDto> getMerchantUserPageList(@RequestBody MerchantUserPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<MerchantUserDto> getMerchantUserPageList(@RequestBody MerchantUserPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getMerchantUserPageList(entity);
     }
 
@@ -83,7 +85,8 @@ public class WasabiCardController {
      * 商户用户注册
      */
     @PostMapping("/merchant/user/register")
-    public BaseResultDto registerMerchantUser(@RequestBody @Validated CardMerchantUserEntity request) throws ServiceException {
+    public BaseResultDto registerMerchantUser(@RequestBody @Validated CardMerchantUserEntity request,InfoEntity infoEntity) throws ServiceException {
+        request.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.registerMerchantUser(request);
     }
 
@@ -115,7 +118,8 @@ public class WasabiCardController {
      * 获取kyc认证分页列表
      */
     @PostMapping("/merchant/kyc/page")
-    ResultWithPagerDto<CardKycStatusDto> getKycPageList(@RequestBody CardKycStatusPageEntity entity) throws ServiceException {
+    ResultWithPagerDto<CardKycStatusDto> getKycPageList(@RequestBody CardKycStatusPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getKycPageList(entity);
     }
 
@@ -155,7 +159,8 @@ public class WasabiCardController {
      * 获取卡片申请列表
      */
     @PostMapping("/card/apply/page")
-    public ResultWithPagerDto<CardApplyDto> getCardApplyPageList(@RequestBody CardApplyPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<CardApplyDto> getCardApplyPageList(@RequestBody CardApplyPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getCardApplyPageList(entity);
     }
 
@@ -171,7 +176,8 @@ public class WasabiCardController {
      * 获取卡片列表
      */
     @PostMapping("/card/page")
-    public ResultWithPagerDto<UcardCardDto> getCardPageList(@RequestBody CardPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<UcardCardDto> getCardPageList(@RequestBody CardPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getCardPageList(entity);
     }
 
@@ -211,7 +217,8 @@ public class WasabiCardController {
      * 获取用户钱包记录列表
      */
     @PostMapping("/card/wallet/record/page")
-    public ResultWithPagerDto<CardWalletRecordDto> getCardWalletRecordPageList(@RequestBody CardWalletRecordPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<CardWalletRecordDto> getCardWalletRecordPageList(@RequestBody CardWalletRecordPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getCardWalletRecordPageList(entity);
     }
 
@@ -267,7 +274,8 @@ public class WasabiCardController {
      * 查询交易记录分页列表
      */
     @PostMapping("/card/transac/page")
-    public ResultWithPagerDto<CardTransacOrderDto> getTransactionPageList(@RequestBody CardTransacOrderPageEntity request) throws ServiceException {
+    public ResultWithPagerDto<CardTransacOrderDto> getTransactionPageList(@RequestBody CardTransacOrderPageEntity request,InfoEntity infoEntity) throws ServiceException {
+        request.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getTransactionPageList(request);
     }
 
@@ -345,7 +353,8 @@ public class WasabiCardController {
      * 卡权限分页列表
      */
     @PostMapping("/card/permission/page")
-    public ResultWithPagerDto<CardPermissionDto> queryPermissionPageList(@RequestBody CardPermissionPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<CardPermissionDto> queryPermissionPageList(@RequestBody CardPermissionPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.queryPermissionPageList(entity);
     }
 
@@ -377,7 +386,8 @@ public class WasabiCardController {
      * 操作记录分页列表
      */
     @PostMapping("/card/operate/page")
-    public ResultWithPagerDto<CardOperateDto> queryOperatePageList(@RequestBody CardOperatePageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<CardOperateDto> queryOperatePageList(@RequestBody CardOperatePageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.queryOperatePageList(entity);
     }
 
@@ -437,7 +447,8 @@ public class WasabiCardController {
      * 证件类型配置列表
      */
     @PostMapping("/card/id/type/config/list")
-    public ResultWithPagerDto<CardIdTypeConfigDto> getCardIdTypeConfigList(@RequestBody CardIdTypeConfigPageEntity entity) throws ServiceException {
+    public ResultWithPagerDto<CardIdTypeConfigDto> getCardIdTypeConfigList(@RequestBody CardIdTypeConfigPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getCardIdTypeConfigList(entity);
     }
 
@@ -526,7 +537,8 @@ public class WasabiCardController {
      * 卡号列表
      */
     @PostMapping("/card/number/list")
-    ResultWithPagerDto<CardNumberDto> queryCardNumberList(@RequestBody CardNumberPageEntity entity) throws ServiceException {
+    ResultWithPagerDto<CardNumberDto> queryCardNumberList(@RequestBody CardNumberPageEntity entity,InfoEntity infoEntity) throws ServiceException {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.queryCardNumberList(entity);
     }
 
@@ -930,7 +942,8 @@ public class WasabiCardController {
      * 币种分页列表
      */
     @PostMapping("/global/currencies/list")
-    ResultWithPagerDto<WasabiAvailableCurrenciesListDto> getCurrenciesPageList(@RequestBody GlobalCurrenciesPageListEntity entity) throws ServiceException{
+    ResultWithPagerDto<WasabiAvailableCurrenciesListDto> getCurrenciesPageList(@RequestBody GlobalCurrenciesPageListEntity entity,InfoEntity infoEntity) throws ServiceException{
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getCurrenciesPageList(entity);
     }
 
@@ -970,7 +983,8 @@ public class WasabiCardController {
      * 速汇订单分页列表
      */
     @PostMapping("/global/order/page/list")
-    public ResultWithPagerDto<GlobalOrderDto> globalOrderPageList(@RequestBody GlobalOrderPageEntity entity) throws Exception {
+    public ResultWithPagerDto<GlobalOrderDto> globalOrderPageList(@RequestBody GlobalOrderPageEntity entity,InfoEntity infoEntity) throws Exception {
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.globalOrderPageList(entity);
     }
 
@@ -1162,7 +1176,8 @@ public class WasabiCardController {
      * 加密货币交易分页列表
      */
     @PostMapping("/encrypted/wallet/transaction/page")
-    ResultWithPagerDto<EncryptedWalletTransactionDto> getEncryptedWalletTransactionPage(@RequestBody EncryptedWalletTransactionPageEntity entity) throws ServiceException{
+    ResultWithPagerDto<EncryptedWalletTransactionDto> getEncryptedWalletTransactionPage(@RequestBody EncryptedWalletTransactionPageEntity entity,InfoEntity infoEntity) throws ServiceException{
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.getEncryptedWalletTransactionPage(entity);
     }
 
@@ -1178,7 +1193,8 @@ public class WasabiCardController {
      * 卡3ds分页列表
      */
     @PostMapping("/card/3ds/transaction/page")
-    ResultWithPagerDto<Card3dsTransactionDto> queryCard3dsTransactionPage(@RequestBody Card3dsTransactionPageEntity entity) throws ServiceException{
+    ResultWithPagerDto<Card3dsTransactionDto> queryCard3dsTransactionPage(@RequestBody Card3dsTransactionPageEntity entity,InfoEntity infoEntity) throws ServiceException{
+        entity.setMerchantId(infoEntity.getIbInfo().getMerchantId());
         return wasabiCardFeignService.queryCard3dsTransactionPage(entity);
     }
 

uacrd-manager-server/src/main/resources/mapper/UserInfoDao.xml

@@ -89,6 +89,9 @@
         <if test="country!=null and country!=''">
             and user_info.country = #{country}
         </if>
+        <if test="merchantId != null">
+            and user_info.merchant_id = #{merchantId}
+        </if>
     </sql>
 
     <select id="getOne" resultType="com.crm.rely.backend.core.pojo.view.UserInfoView">

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

@@ -1,11 +1,15 @@
 package com.crm.ucard.controller;
 
 import com.crm.rely.backend.core.constant.FeignClientAnnotation;
-import com.crm.rely.backend.core.dto.base.*;
+import com.crm.rely.backend.core.dto.base.BaseReportResultDto;
+import com.crm.rely.backend.core.dto.base.BaseResultDto;
+import com.crm.rely.backend.core.dto.base.ResultWithPagerDto;
 import com.crm.rely.backend.core.dto.ucard.*;
 import com.crm.rely.backend.core.dto.ucard.vaultody.VaultodyDepositAddressDto;
 import com.crm.rely.backend.core.dto.wasabi.*;
-import com.crm.rely.backend.core.entity.base.*;
+import com.crm.rely.backend.core.entity.base.BaseDeleteEntities;
+import com.crm.rely.backend.core.entity.base.BaseEntity;
+import com.crm.rely.backend.core.entity.base.SingleLongEntity;
 import com.crm.rely.backend.core.entity.custom.info.InfoEntity;
 import com.crm.rely.backend.core.entity.custom.kyc.WebsdkLinkAliEntity;
 import com.crm.rely.backend.core.entity.ucard.*;
@@ -14,7 +18,9 @@ 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.ucard.service.*;
+import com.crm.ucard.service.UcardService;
+import com.crm.ucard.service.VaultodyService;
+import com.crm.ucard.service.WasabiCardService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;

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

@@ -850,6 +850,7 @@ public class WasabiCardServiceImpl implements WasabiCardService {
         table.setAddTime(new Date());
         table.setCardCategory(Constants.CARD_CATEGORY_WASABI);
         table.setAuthStatus(0);
+        table.setMerchantId(entity.getMerchantId());
         merchantUserRepository.save(table);
 
         CardKycStatusTable kycStatusTable = new CardKycStatusTable();
@@ -857,6 +858,7 @@ public class WasabiCardServiceImpl implements WasabiCardService {
         kycStatusTable.setStatus(1);
         kycStatusTable.setCardCategory(Constants.CARD_CATEGORY_WASABI);
         kycStatusTable.setAddTime(new Date());
+        kycStatusTable.setMerchantId(entity.getMerchantId());
         kycStatusRepository.save(kycStatusTable);
 
         CardOperateTable operateTable = new CardOperateTable();
@@ -865,6 +867,7 @@ public class WasabiCardServiceImpl implements WasabiCardService {
         operateTable.setStatus(Constants.SUCCESS);
         operateTable.setAddTime(new Date());
         operateTable.setUniqueId(table.getUniqueId());
+        operateTable.setMerchantId(entity.getMerchantId());
         cardOperateRepository.save(operateTable);
 
         return BaseResultDto.success(Constants.SUCCESS, table.getId());

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

@@ -9,6 +9,9 @@
         ucard_3ds_transaction a
         LEFT JOIN ucard_merchant_user b ON a.unique_id = b.unique_id
         <where>
+            <if test="merchantId != null">
+                and b.merchant_id = #{merchantId}
+            </if>
             <if test="type != null and type != ''">
                 and a.`type` = #{type}
             </if>
@@ -42,6 +45,9 @@
         ucard_3ds_transaction a
         LEFT JOIN ucard_merchant_user b ON a.unique_id = b.unique_id
         <where>
+            <if test="merchantId != null">
+                and b.merchant_id = #{merchantId}
+            </if>
             <if test="type != null and type != ''">
                 and a.`type` = #{type}
             </if>

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

@@ -24,6 +24,9 @@
         ) uu
         on a.mailing_town = uu.code and uu.card_category = b.card_category
         <where>
+            <if test="merchantId != null">
+                and a.merchant_id = #{merchantId}
+            </if>
             <if test="cardNo!=null and cardNo!=''">
                 and a.`card_no` like concat(#{cardNo},'%')
             </if>
@@ -157,6 +160,9 @@
         ) uu
         on a.mailing_town = uu.code and uu.card_category = b.card_category
         <where>
+            <if test="merchantId != null">
+                and a.merchant_id = #{merchantId}
+            </if>
             <if test="cardNo!=null and cardNo!=''">
                 and a.`card_no` like concat(#{cardNo},'%')
             </if>

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

@@ -9,6 +9,9 @@
         ucard_crypto_callback_record a
         LEFT JOIN ucard_merchant_user b ON a.unique_id = b.unique_id
         <where>
+            <if test="merchantId != null">
+                and b.merchant_id = #{merchantId}
+            </if>
             <if test="unit != null and unit != ''">
                 and a.`unit` = #{unit}
             </if>
@@ -42,6 +45,9 @@
         ucard_crypto_callback_record a
         LEFT JOIN ucard_merchant_user b ON a.unique_id = b.unique_id
         <where>
+            <if test="merchantId != null">
+                and b.merchant_id = #{merchantId}
+            </if>
             <if test="unit != null and unit != ''">
                 and a.`unit` = #{unit}
             </if>

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

@@ -7,6 +7,9 @@
         SELECT COUNT(*) FROM ucard_global_order g
         LEFT JOIN ucard_merchant_user uc ON g.unique_id = uc.unique_id
         <where>
+            <if test="merchantId != null">
+                and uc.merchant_id = #{merchantId}
+            </if>
             <if test="merchantOrderNo != null and merchantOrderNo != ''">
                 and g.`merchant_order_no` = #{merchantOrderNo}
             </if>
@@ -72,6 +75,9 @@
         LEFT JOIN ucard_merchant_user uc ON g.unique_id = uc.unique_id
         LEFT JOIN sys_reasons_refusal rr ON rr.id = g.approve_desc
         <where>
+            <if test="merchantId != null">
+                and uc.merchant_id = #{merchantId}
+            </if>
             <if test="merchantOrderNo != null and merchantOrderNo != ''">
                 and g.`merchant_order_no` = #{merchantOrderNo}
             </if>

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

@@ -9,6 +9,9 @@
         left join ucard_merchant_user uc on a.unique_id = uc.unique_id
         left join sys_reasons_refusal rr on rr.id = a.approve_desc
         <where>
+            <if test="merchantId!=null">
+                and a.`merchant_id` = #{merchantId}
+            </if>
             <if test="status!=null">
                 and a.`status` = #{status}
             </if>
@@ -62,6 +65,9 @@
         left join ucard_merchant_user uc on a.unique_id = uc.unique_id
         left join sys_reasons_refusal rr on rr.id = a.approve_desc
         <where>
+            <if test="merchantId!=null">
+                and a.`merchant_id` = #{merchantId}
+            </if>
             <if test="status!=null">
                 and a.`status` = #{status}
             </if>

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="merchantId!=null and merchantId!=''">
+                and um.`merchant_id` = #{merchantId}
+            </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="merchantId != null">
+                and um.`merchant_id` = #{merchantId}
+            </if>
             <if test="mobile!=null and mobile!=''">
                 and um.`mobile` like concat(#{mobile},'%')
             </if>

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

@@ -9,6 +9,9 @@
         LEFT JOIN ucard_card b on a.card_no = b.card_no
         LEFT JOIN ucard_merchant_user c on a.unique_id = c.unique_id
         <where>
+            <if test="merchantId != null">
+                and c.merchant_id = #{merchantId}
+            </if>
             <if test="cardNumber != null and cardNumber != ''">
                 and b.`card_number` like concat(#{cardNumber},'%')
             </if>
@@ -43,6 +46,9 @@
         LEFT JOIN ucard_card b on a.card_no = b.card_no
         LEFT JOIN ucard_merchant_user c on a.unique_id = c.unique_id
         <where>
+            <if test="merchantId != null">
+                and c.merchant_id = #{merchantId}
+            </if>
             <if test="cardNumber != null and cardNumber != ''">
                 and b.`card_number` like concat(#{cardNumber},'%')
             </if>

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

@@ -11,6 +11,9 @@
         LEFT JOIN ucard_type_config ut ON ut.card_type_id = b.card_type_id
         LEFT JOIN ucard_merchant_user uc ON c.unique_id = uc.unique_id
         <where>
+            <if test="merchantId != null">
+                and uc.`merchant_id` = #{merchantId}
+            </if>
             <if test="cardNumber!=null and cardNumber!=''">
                 and c.`card_number` like concat(#{cardNumber},'%')
             </if>
@@ -73,6 +76,9 @@
         LEFT JOIN ucard_type_config ut ON ut.card_type_id = b.card_type_id
         LEFT JOIN ucard_merchant_user uc ON c.unique_id = uc.unique_id
         <where>
+            <if test="merchantId != null">
+                and uc.`merchant_id` = #{merchantId}
+            </if>
             <if test="cardNumber!=null and cardNumber!=''">
                 and c.`card_number` like concat(#{cardNumber},'%')
             </if>

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

@@ -8,6 +8,9 @@
         left join ucard_merchant_user um
         ON uw.c_id = um.c_id
         <where>
+            <if test="merchantId != null">
+                and um.merchant_id = #{merchantId}
+            </if>
             <if test="type != null and type > 0">
                 and uw.`type` = #{type}
             </if>
@@ -43,6 +46,9 @@
         left join ucard_merchant_user um
         ON uw.c_id = um.c_id
         <where>
+            <if test="merchantId != null">
+                and um.merchant_id = #{merchantId}
+            </if>
             <if test="type != null and type > 0">
                 and uw.`type` = #{type}
             </if>

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

@@ -9,6 +9,9 @@
         LEFT JOIN ucard_type_config t ON t.card_type_id = b.card_type_id
         LEFT JOIN ucard_merchant_user uc ON c.unique_id = uc.unique_id
         <where>
+            <if test="merchantId != null">
+                and uc.`merchant_id` = #{merchantId}
+            </if>
             <if test="cardNumber!=null and cardNumber!=''">
                 and c.`card_number` like concat(#{cardNumber},'%')
             </if>

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

@@ -28,5 +28,7 @@ public class Card3dsTransactionPageEntity extends BaseSearchPageEntity {
      */
     private String type;
 
+    private Integer merchantId;
+
 
 }

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

@@ -55,4 +55,6 @@ public class CardApplyPageEntity extends BaseSearchPageEntity {
      */
     private Date endDate;
 
+    private Integer merchantId;
+
 }

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

@@ -16,4 +16,6 @@ public class CardIdTypeConfigPageEntity extends BaseSearchPageEntity {
      */
     private String idType;
 
+    private Integer merchantId;
+
 } 

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

@@ -3,6 +3,8 @@ package com.crm.rely.backend.core.entity.ucard;
 import com.crm.rely.backend.core.entity.base.BaseSearchPageEntity;
 import lombok.Data;
 
+import javax.persistence.criteria.CriteriaBuilder;
+
 @Data
 public class CardKycStatusPageEntity extends BaseSearchPageEntity {
 
@@ -33,4 +35,6 @@ public class CardKycStatusPageEntity extends BaseSearchPageEntity {
      */
     private Integer photoStatus;
 
+    private Integer merchantId;
+
 }

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

@@ -20,5 +20,7 @@ public class CardMerchantUserEntity extends WasabiUserEntity {
      */
     private Long operateUser;
 
+    private Integer merchantId;
+
 
 } 

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

@@ -16,4 +16,6 @@ public class CardNumberPageEntity extends BaseSearchPageEntity {
      */
     private Integer status;
 
+    private Integer merchantId;
+
 }

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

@@ -46,4 +46,6 @@ public class CardOperatePageEntity extends BaseSearchPageEntity {
      */
     private Date endDate;
 
+    private Integer merchantId;
+
 }

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

@@ -53,5 +53,7 @@ public class CardPageEntity extends BaseSearchPageEntity {
      */
     private Integer blockedStatus;
 
+    private Integer merchantId;
+
 
 }

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

@@ -31,4 +31,6 @@ public class CardPermissionPageEntity extends BaseSearchPageEntity {
      */
     private Integer enableStatus;
 
+    private Integer merchantId;
+
 }

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

@@ -53,4 +53,6 @@ public class CardTransacOrderPageEntity extends BaseSearchPageEntity {
      */
     private String cardType;
 
+    private Integer merchantId;
+
 } 

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

@@ -29,4 +29,6 @@ public class CardWalletRecordPageEntity extends BaseSearchPageEntity {
 
     private Date endDate;
 
+    private Integer merchantId;
+
 }

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

@@ -23,4 +23,6 @@ public class EncryptedWalletTransactionPageEntity extends BaseSearchPageEntity {
      * 定义交易单位，例如BTC。
      */
     private String unit;
+
+    private Integer merchantId;
 }

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

@@ -3,6 +3,8 @@ package com.crm.rely.backend.core.entity.ucard;
 import com.crm.rely.backend.core.entity.base.BaseSearchPageEntity;
 import lombok.Data;
 
+import javax.persistence.criteria.CriteriaBuilder;
+
 @Data
 public class GlobalCurrenciesPageListEntity extends BaseSearchPageEntity {
 
@@ -26,5 +28,7 @@ public class GlobalCurrenciesPageListEntity extends BaseSearchPageEntity {
      */
     private String status;
 
+    private Integer merchantId;
+
 
 }

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

@@ -78,4 +78,6 @@ public class GlobalOrderPageEntity extends BaseSearchPageEntity {
      */
     private Date endDate;
 
+    private Integer merchantId;
+
 } 

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 Integer merchantId;
+
 }

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

@@ -36,4 +36,6 @@ public class UserInfoSearchEntity extends BaseSearchPageEntity {
      * 国家
      */
     private String country;
+
+    private Integer merchantId;
 }

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

@@ -57,5 +57,7 @@ public class CardKycStatusTable extends BaseTable {
      */
     private String approveDesc;
 
+    private Integer merchantId;
+
 
 } 

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

@@ -253,4 +253,6 @@ public class CardMerchantUserTable extends BaseTable {
      */
     private BigDecimal globalFixedFee;
 
+    private Integer merchantId;
+
 } 

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

@@ -76,4 +76,6 @@ public class CardOperateTable extends BaseTable {
      */
     private Long operateUser;
 
+    private Integer merchantId;
+
 }