From 6fad3b45fedee7066df597056f33f2bccdc92519 Mon Sep 17 00:00:00 2001 From: ziin Date: Wed, 31 Dec 2025 10:33:37 +0800 Subject: [PATCH] =?UTF-8?q?refactor(tenant-commission):=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=88=91=E7=9A=84=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=B9=B6=E7=BB=9F=E4=B8=80=E6=8C=89=E7=A7=9F=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KeyboardTenantCommissionController.java | 8 ------ .../vo/KeyboardTenantCommissionPageReqVO.java | 3 +++ .../KeyboardTenantCommissionMapper.java | 25 +------------------ .../KeyboardTenantCommissionService.java | 1 - .../KeyboardTenantCommissionServiceImpl.java | 20 ++++++++++----- 5 files changed, 18 insertions(+), 39 deletions(-) diff --git a/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/KeyboardTenantCommissionController.java b/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/KeyboardTenantCommissionController.java index e37f48e..c0df52f 100644 --- a/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/KeyboardTenantCommissionController.java +++ b/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/KeyboardTenantCommissionController.java @@ -90,14 +90,6 @@ public class KeyboardTenantCommissionController { return success(BeanUtils.toBean(pageResult, KeyboardTenantCommissionRespVO.class)); } - @GetMapping("/my-page") - @Operation(summary = "获得当前登录租户的分成记录分页") - @PreAuthorize("@ss.hasPermission('keyboard:tenant-commission:query:mypage')") - public CommonResult> getMyTenantCommissionPage(@Valid KeyboardTenantCommissionPageReqVO pageReqVO) { - PageResult pageResult = tenantCommissionService.getMyTenantCommissionPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, KeyboardTenantCommissionRespVO.class)); - } - @GetMapping("/export-excel") @Operation(summary = "导出租户内购分成记录 Excel") @PreAuthorize("@ss.hasPermission('keyboard:tenant-commission:export')") diff --git a/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/vo/KeyboardTenantCommissionPageReqVO.java b/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/vo/KeyboardTenantCommissionPageReqVO.java index 9a59dfa..d108ed5 100644 --- a/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/vo/KeyboardTenantCommissionPageReqVO.java +++ b/keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/vo/KeyboardTenantCommissionPageReqVO.java @@ -14,6 +14,9 @@ import static com.yolo.keyboard.framework.common.util.date.DateUtils.FORMAT_YEAR @Data public class KeyboardTenantCommissionPageReqVO extends PageParam { + @Schema(description = "租户ID", example = "1", hidden = true) + private Long tenantId; + @Schema(description = "内购记录ID", example = "20900") private Integer purchaseRecordId; diff --git a/keyboard-server/src/main/java/com/yolo/keyboard/dal/mysql/tenantcommission/KeyboardTenantCommissionMapper.java b/keyboard-server/src/main/java/com/yolo/keyboard/dal/mysql/tenantcommission/KeyboardTenantCommissionMapper.java index 1baf138..91fe645 100644 --- a/keyboard-server/src/main/java/com/yolo/keyboard/dal/mysql/tenantcommission/KeyboardTenantCommissionMapper.java +++ b/keyboard-server/src/main/java/com/yolo/keyboard/dal/mysql/tenantcommission/KeyboardTenantCommissionMapper.java @@ -41,6 +41,7 @@ public interface KeyboardTenantCommissionMapper extends BaseMapperX selectPage(KeyboardTenantCommissionPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(KeyboardTenantCommissionDO::getTenantId, reqVO.getTenantId()) .eqIfPresent(KeyboardTenantCommissionDO::getPurchaseRecordId, reqVO.getPurchaseRecordId()) .eqIfPresent(KeyboardTenantCommissionDO::getTransactionId, reqVO.getTransactionId()) .eqIfPresent(KeyboardTenantCommissionDO::getInviteeUserId, reqVO.getInviteeUserId()) @@ -57,28 +58,4 @@ public interface KeyboardTenantCommissionMapper extends BaseMapperX selectPageByTenantId(KeyboardTenantCommissionPageReqVO reqVO, Long tenantId) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(KeyboardTenantCommissionDO::getTenantId, tenantId) - .eqIfPresent(KeyboardTenantCommissionDO::getPurchaseRecordId, reqVO.getPurchaseRecordId()) - .eqIfPresent(KeyboardTenantCommissionDO::getTransactionId, reqVO.getTransactionId()) - .eqIfPresent(KeyboardTenantCommissionDO::getInviteeUserId, reqVO.getInviteeUserId()) - .eqIfPresent(KeyboardTenantCommissionDO::getInviterUserId, reqVO.getInviterUserId()) - .eqIfPresent(KeyboardTenantCommissionDO::getPurchaseAmount, reqVO.getPurchaseAmount()) - .eqIfPresent(KeyboardTenantCommissionDO::getCommissionRate, reqVO.getCommissionRate()) - .eqIfPresent(KeyboardTenantCommissionDO::getCommissionAmount, reqVO.getCommissionAmount()) - .eqIfPresent(KeyboardTenantCommissionDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(KeyboardTenantCommissionDO::getPurchaseTime, reqVO.getPurchaseTime()) - .eqIfPresent(KeyboardTenantCommissionDO::getSettledAt, reqVO.getSettledAt()) - .eqIfPresent(KeyboardTenantCommissionDO::getBalanceTransactionId, reqVO.getBalanceTransactionId()) - .eqIfPresent(KeyboardTenantCommissionDO::getCreatedAt, reqVO.getCreatedAt()) - .eqIfPresent(KeyboardTenantCommissionDO::getUpdatedAt, reqVO.getUpdatedAt()) - .eqIfPresent(KeyboardTenantCommissionDO::getRemark, reqVO.getRemark()) - .orderByDesc(KeyboardTenantCommissionDO::getId)); - } - } diff --git a/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionService.java b/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionService.java index 67eec74..300da9a 100644 --- a/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionService.java +++ b/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionService.java @@ -65,6 +65,5 @@ public interface KeyboardTenantCommissionService { * @param pageReqVO 分页查询 * @return 租户内购分成记录分页 */ - PageResult getMyTenantCommissionPage(KeyboardTenantCommissionPageReqVO pageReqVO); } \ No newline at end of file diff --git a/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionServiceImpl.java b/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionServiceImpl.java index ac9a612..8d0cfd9 100644 --- a/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionServiceImpl.java +++ b/keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionServiceImpl.java @@ -15,6 +15,8 @@ import com.yolo.keyboard.framework.common.util.object.BeanUtils; import com.yolo.keyboard.dal.mysql.tenantcommission.KeyboardTenantCommissionMapper; import com.yolo.keyboard.framework.tenant.core.context.TenantContextHolder; +import com.yolo.keyboard.module.system.dal.dataobject.tenant.TenantDO; +import com.yolo.keyboard.module.system.dal.mysql.tenant.TenantMapper; import static com.yolo.keyboard.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.yolo.keyboard.framework.common.util.collection.CollectionUtils.convertList; @@ -32,6 +34,9 @@ public class KeyboardTenantCommissionServiceImpl implements KeyboardTenantCommis @Resource private KeyboardTenantCommissionMapper tenantCommissionMapper; + @Resource + private TenantMapper tenantMapper; + @Override public Long createTenantCommission(KeyboardTenantCommissionSaveReqVO createReqVO) { // 插入 @@ -79,13 +84,16 @@ public class KeyboardTenantCommissionServiceImpl implements KeyboardTenantCommis @Override public PageResult getTenantCommissionPage(KeyboardTenantCommissionPageReqVO pageReqVO) { + // 如果当前租户的 tenantLevel 不等于 0，只能查询属于自己的数据 + Long currentTenantId = TenantContextHolder.getTenantId(); + if (currentTenantId != null) { + TenantDO currentTenant = tenantMapper.selectById(currentTenantId); + if (currentTenant != null && currentTenant.getTenantLevel() != null + && currentTenant.getTenantLevel() != 0) { + pageReqVO.setTenantId(currentTenantId); + } + } return tenantCommissionMapper.selectPage(pageReqVO); } - @Override - public PageResult getMyTenantCommissionPage(KeyboardTenantCommissionPageReqVO pageReqVO) { - Long tenantId = TenantContextHolder.getRequiredTenantId(); - return tenantCommissionMapper.selectPageByTenantId(pageReqVO, tenantId); - } - } \ No newline at end of file