ziin/keyboard_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(tenant-commission): 移除我的分页接口并统一按租户权限过滤

Browse Source
This commit is contained in:
ziin
2025-12-31 10:33:37 +08:00
parent a8da54c130
commit 6fad3b45fe
5 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/KeyboardTenantCommissionController.java
View File

@@ -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<PageResult<KeyboardTenantCommissionRespVO>> getMyTenantCommissionPage(@Valid KeyboardTenantCommissionPageReqVO pageReqVO) {
PageResult<KeyboardTenantCommissionDO> pageResult = tenantCommissionService.getMyTenantCommissionPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, KeyboardTenantCommissionRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出租户内购分成记录 Excel")
@PreAuthorize("@ss.hasPermission('keyboard:tenant-commission:export')")

3
keyboard-server/src/main/java/com/yolo/keyboard/controller/admin/tenantcommission/vo/KeyboardTenantCommissionPageReqVO.java
View File

@@ -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;

25
keyboard-server/src/main/java/com/yolo/keyboard/dal/mysql/tenantcommission/KeyboardTenantCommissionMapper.java
View File

@@ -41,6 +41,7 @@ public interface KeyboardTenantCommissionMapper extends BaseMapperX<KeyboardTena
default PageResult<KeyboardTenantCommissionDO> selectPage(KeyboardTenantCommissionPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<KeyboardTenantCommissionDO>()
.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<KeyboardTena
.eqIfPresent(KeyboardTenantCommissionDO::getRemark, reqVO.getRemark())
.orderByDesc(KeyboardTenantCommissionDO::getId));
}
/**
* 根据租户ID分页查询分成记录
*/
default PageResult<KeyboardTenantCommissionDO> selectPageByTenantId(KeyboardTenantCommissionPageReqVO reqVO, Long tenantId) {
return selectPage(reqVO, new LambdaQueryWrapperX<KeyboardTenantCommissionDO>()
.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));
}
}

1
keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionService.java
View File

@@ -65,6 +65,5 @@ public interface KeyboardTenantCommissionService {
* @param pageReqVO 分页查询
* @return 租户内购分成记录分页
*/
PageResult<KeyboardTenantCommissionDO> getMyTenantCommissionPage(KeyboardTenantCommissionPageReqVO pageReqVO);
}

20
keyboard-server/src/main/java/com/yolo/keyboard/service/tenantcommission/KeyboardTenantCommissionServiceImpl.java
View File

@@ -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<KeyboardTenantCommissionDO> 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<KeyboardTenantCommissionDO> getMyTenantCommissionPage(KeyboardTenantCommissionPageReqVO pageReqVO) {
Long tenantId = TenantContextHolder.getRequiredTenantId();
return tenantCommissionMapper.selectPageByTenantId(pageReqVO, tenantId);
}
}