From ef0633c035f178b181959564d5d68c2c9876d44d Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 3 Dec 2025 19:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E4=BB=A3=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/user/RechargeUserServiceImpl.java | 13 +++++++------ .../team/AdminRechargeAgentRelation.java | 4 ++-- .../AdminRechargeAgentRelationService.java | 10 ++++++++++ .../AdminRechargeAgentRelationServiceImpl.java | 18 ++++++++++++++++++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/RechargeUserServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/RechargeUserServiceImpl.java index 8a03575f..5e3b2ba0 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/RechargeUserServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/RechargeUserServiceImpl.java @@ -11,8 +11,9 @@ import com.red.circle.order.inner.model.dto.MonthlyRechargeSummaryVO; import com.red.circle.order.inner.model.dto.UserMonthlyRechargeDTO; import com.red.circle.other.app.dto.h5.RechargePageVO; import com.red.circle.other.app.service.recharge.RechargeUserService; -import com.red.circle.other.infra.database.rds.dao.team.BusinessDevelopmentTeamDAO; +import com.red.circle.other.infra.database.rds.entity.team.AdminRechargeAgentRelation; import com.red.circle.other.infra.database.rds.service.sys.AdministratorService; +import com.red.circle.other.infra.database.rds.service.team.AdminRechargeAgentRelationService; import com.red.circle.other.inner.endpoint.user.user.UserProfileClient; import com.red.circle.other.inner.model.dto.user.UserProfileDTO; import lombok.RequiredArgsConstructor; @@ -32,7 +33,7 @@ public class RechargeUserServiceImpl implements RechargeUserService { private final UserMonthlyRechargeClient userMonthlyRechargeClient; private final UserProfileClient userProfileClient; private final AdministratorService administratorService; - private final BusinessDevelopmentTeamDAO businessDevelopmentTeamDAO; + private final AdminRechargeAgentRelationService adminRechargeAgentRelationService; @Override public PageResult getRechargePage(PageUserIdCmd page, AppExtCommand cmd) { @@ -41,10 +42,10 @@ public class RechargeUserServiceImpl implements RechargeUserService { ResponseAssert.failure(CommonErrorCode.OPERATING_FAILURE); } - Page objectPage = new Page<>(); + Page objectPage = new Page<>(); objectPage.setCurrent(page.getPageQuery().getCursor()); objectPage.setSize(page.getPageQuery().getLimit()); - Page pagedRechargeAgency = businessDevelopmentTeamDAO.pageRechargeAgency(cmd.getReqUserId(), objectPage); + Page pagedRechargeAgency = adminRechargeAgentRelationService.pageRechargeAgentByAdmin(cmd.getReqUserId(), objectPage); if (pagedRechargeAgency == null || pagedRechargeAgency.getRecords().isEmpty()) { return null; } @@ -75,10 +76,10 @@ public class RechargeUserServiceImpl implements RechargeUserService { @Override public List getRechargeSummary(AppExtCommand cmd) { - Page objectPage = new Page<>(); + Page objectPage = new Page<>(); objectPage.setCurrent(1L); objectPage.setSize(3000L); - Page pagedRechargeAgency = businessDevelopmentTeamDAO.pageRechargeAgency(cmd.getReqUserId(), objectPage); + Page pagedRechargeAgency = adminRechargeAgentRelationService.pageRechargeAgentByAdmin(cmd.getReqUserId(), objectPage); if (pagedRechargeAgency == null || pagedRechargeAgency.getRecords().isEmpty()) { return null; } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/AdminRechargeAgentRelation.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/AdminRechargeAgentRelation.java index 43f58aee..b5bbd98f 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/AdminRechargeAgentRelation.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/AdminRechargeAgentRelation.java @@ -45,13 +45,13 @@ public class AdminRechargeAgentRelation { /** * 创建时间. */ - @TableField(value = "create_time", fill = FieldFill.INSERT) + @TableField(value = "create_time") private LocalDateTime createTime; /** * 修改时间. */ - @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "update_time") private LocalDateTime updateTime; } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/AdminRechargeAgentRelationService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/AdminRechargeAgentRelationService.java index f95d0938..6770f38f 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/AdminRechargeAgentRelationService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/AdminRechargeAgentRelationService.java @@ -1,5 +1,6 @@ package com.red.circle.other.infra.database.rds.service.team; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.red.circle.framework.mybatis.service.BaseService; import com.red.circle.other.infra.database.rds.entity.team.AdminRechargeAgentRelation; @@ -33,4 +34,13 @@ public interface AdminRechargeAgentRelationService extends BaseService pageRechargeAgentByAdmin(Long adminUserId, Page page); + } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/impl/AdminRechargeAgentRelationServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/impl/AdminRechargeAgentRelationServiceImpl.java index 2cf05360..b444fb03 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/impl/AdminRechargeAgentRelationServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/team/impl/AdminRechargeAgentRelationServiceImpl.java @@ -1,6 +1,8 @@ package com.red.circle.other.infra.database.rds.service.team.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl; import com.red.circle.other.infra.database.rds.dao.team.AdminRechargeAgentRelationDAO; import com.red.circle.other.infra.database.rds.entity.team.AdminRechargeAgentRelation; @@ -35,4 +37,20 @@ public class AdminRechargeAgentRelationServiceImpl extends save(relation); } + @Override + public Page pageRechargeAgentByAdmin(Long adminUserId, Page page) { + IPage relationPage = page(page, new LambdaQueryWrapper() + .eq(AdminRechargeAgentRelation::getAdminUserId, adminUserId) + .orderByDesc(AdminRechargeAgentRelation::getCreateTime)); + + Page result = new Page<>(); + result.setCurrent(relationPage.getCurrent()); + result.setSize(relationPage.getSize()); + result.setTotal(relationPage.getTotal()); + result.setRecords(relationPage.getRecords().stream() + .map(AdminRechargeAgentRelation::getUserId) + .toList()); + return result; + } + }