From 874aaec4bcfa72ac9281d72666ad0bf2d7787226 Mon Sep 17 00:00:00 2001 From: nili Date: Fri, 24 May 2024 16:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=92=8C?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game/dao/bean/MatrixMoneyRecord.java | 2 +- .../group/game/service/MatrixService.java | 1 + .../game/service/bo/MatrixAdvRecordBo.java | 16 +--- .../group/game/service/bo/citrus/UserBo.java | 22 +++++- .../group/game/service/bo/matrix/MoneyBo.java | 35 +++++++++ .../game/service/bo/matrix/MoneyQuery.java | 8 ++ .../game/service/bo/matrix/UserQuery.java | 8 ++ .../service/{ => citrus}/ScheduleService.java | 2 +- .../game/service/citrus/UserService.java | 2 +- .../{ => matrix}/AdminDeviceService.java | 2 +- .../service/{ => matrix}/AdminService.java | 2 +- .../{ => matrix}/AggregationService.java | 2 +- .../{ => matrix}/AggregationSubService.java | 2 +- .../service/matrix/MatrixMoneyService.java | 73 +++++++++++++++++++ .../service/matrix/MatrixUserService.java | 54 ++++++++++++++ .../game/service/{ => matrix}/OSSService.java | 2 +- .../group/game/service/AdminServiceTest.java | 2 + .../game/web/controller/MatrixController.java | 2 +- .../game/web/rest/matrix/AdminController.java | 4 +- .../web/rest/matrix/DeviceController.java | 2 +- .../matrix/MatrixAppConfigController.java | 2 +- .../rest/matrix/MatrixMoneyController.java | 34 +++++++++ .../web/rest/matrix/MatrixUserController.java | 23 ++++++ 23 files changed, 273 insertions(+), 29 deletions(-) create mode 100644 game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyBo.java create mode 100644 game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyQuery.java create mode 100644 game-service/src/main/java/awesome/group/game/service/bo/matrix/UserQuery.java rename game-service/src/main/java/awesome/group/game/service/{ => citrus}/ScheduleService.java (97%) rename game-service/src/main/java/awesome/group/game/service/{ => matrix}/AdminDeviceService.java (99%) rename game-service/src/main/java/awesome/group/game/service/{ => matrix}/AdminService.java (99%) rename game-service/src/main/java/awesome/group/game/service/{ => matrix}/AggregationService.java (96%) rename game-service/src/main/java/awesome/group/game/service/{ => matrix}/AggregationSubService.java (98%) create mode 100644 game-service/src/main/java/awesome/group/game/service/matrix/MatrixMoneyService.java create mode 100644 game-service/src/main/java/awesome/group/game/service/matrix/MatrixUserService.java rename game-service/src/main/java/awesome/group/game/service/{ => matrix}/OSSService.java (99%) create mode 100644 game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java create mode 100644 game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java diff --git a/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixMoneyRecord.java b/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixMoneyRecord.java index a96864f..69ec11f 100644 --- a/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixMoneyRecord.java +++ b/game-dao/src/main/java/awesome/group/game/dao/bean/MatrixMoneyRecord.java @@ -16,6 +16,6 @@ public class MatrixMoneyRecord { private String aliPayAccount; private String name; private String reason; - private Integer status;//0发起申请，1审批成功，2转账中，3转账成功，-1转账失败 + private Integer status;//0发起申请，1审批成功，2转账中，3转账成功，-1转账失败, -2审批失败 private Timestamp createdAt; } diff --git a/game-service/src/main/java/awesome/group/game/service/MatrixService.java b/game-service/src/main/java/awesome/group/game/service/MatrixService.java index de4ca18..34a662c 100644 --- a/game-service/src/main/java/awesome/group/game/service/MatrixService.java +++ b/game-service/src/main/java/awesome/group/game/service/MatrixService.java @@ -7,6 +7,7 @@ import awesome.group.game.dao.mapper.MatrixAppMapper; import awesome.group.game.service.bo.MatrixAdvRecordEditBo; import awesome.group.game.service.bo.MatrixAdvRecordSimple; import awesome.group.game.service.common.log.L; +import awesome.group.game.service.matrix.AdminDeviceService; import awesome.group.game.service.util.EncryptUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java b/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java index 00cbb05..dd9db2a 100644 --- a/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java +++ b/game-service/src/main/java/awesome/group/game/service/bo/MatrixAdvRecordBo.java @@ -32,20 +32,6 @@ public class MatrixAdvRecordBo extends MatrixAdvRecordEditBo { } public void setUser(MatrixUser u) { - UserBo bo = new UserBo(u); - bo.mobile = replaceWithX(bo.mobile); - bo.aliPayAccount = replaceWithX(bo.aliPayAccount); - bo.wxOpenId = replaceWithX(bo.wxOpenId); - this.user = bo; - } - - public static String replaceWithX(String str) { - if (!StringUtils.hasText(str)) { - return str; - } - int mid = str.length() / 2; - StringBuilder sb = new StringBuilder(str); - sb.replace(mid, sb.length(), "x".repeat(mid)); - return sb.toString(); + this.user = new UserBo(u, true); } } diff --git a/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java b/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java index f177f45..2d56698 100644 --- a/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java +++ b/game-service/src/main/java/awesome/group/game/service/bo/citrus/UserBo.java @@ -1,6 +1,7 @@ package awesome.group.game.service.bo.citrus; import awesome.group.game.dao.bean.MatrixUser; +import org.springframework.util.StringUtils; public class UserBo { public Integer id; @@ -16,11 +17,12 @@ public class UserBo { public String inviteUrl; public String wxOpenId;//微信openId + public long createdAt; public UserBo() { } - public UserBo(MatrixUser u) { + public UserBo(MatrixUser u, boolean encrypt) { this.id = u.getId(); this.mobile = u.getMobile(); this.name = u.getName(); @@ -33,5 +35,23 @@ public class UserBo { this.money = u.getMoney(); this.goldCoin = u.getIncome() - (u.getMoney() * 1000); this.wxOpenId = u.getWxOpenId(); + this.createdAt = u.getCreatedAt().getTime(); + + if (encrypt) { + this.mobile = replaceWithX(this.mobile); + this.aliPayAccount = replaceWithX(this.aliPayAccount); + this.wxOpenId = replaceWithX(this.wxOpenId); + } + } + + public static String replaceWithX(String str) { + if (!StringUtils.hasText(str)) { + return str; + } + int mid = str.length() / 2; + StringBuilder sb = new StringBuilder(str); + sb.replace(mid, sb.length(), "x".repeat(mid)); + return sb.toString(); } + } diff --git a/game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyBo.java b/game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyBo.java new file mode 100644 index 0000000..f27312d --- /dev/null +++ b/game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyBo.java @@ -0,0 +1,35 @@ +package awesome.group.game.service.bo.matrix; + +import awesome.group.game.dao.bean.MatrixMoneyRecord; +import awesome.group.game.dao.bean.MatrixUser; +import awesome.group.game.service.bo.citrus.UserBo; + +public class MoneyBo { + public UserBo user; + public Integer id; + public Integer cent; + public String aliPayAccount; + public String name; + public String reason; + public Integer status;//0发起申请，1审批成功，2转账中，3转账成功，-1转账失败 + public long createdAt; + + public MoneyBo() { + } + + public MoneyBo(MatrixUser user, MatrixMoneyRecord r, boolean encypt) { + this.user = new UserBo(user, encypt); + this.id = r.getId(); + this.cent = r.getCent(); + this.aliPayAccount = r.getAliPayAccount(); + this.name = r.getName(); + this.reason = r.getReason(); + this.status = r.getStatus(); + this.createdAt = r.getCreatedAt().getTime(); + + if (encypt) { + this.aliPayAccount = UserBo.replaceWithX(this.aliPayAccount); + this.name = UserBo.replaceWithX(this.name); + } + } +} diff --git a/game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyQuery.java b/game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyQuery.java new file mode 100644 index 0000000..63b7582 --- /dev/null +++ b/game-service/src/main/java/awesome/group/game/service/bo/matrix/MoneyQuery.java @@ -0,0 +1,8 @@ +package awesome.group.game.service.bo.matrix; + +import awesome.group.game.service.bo.PageParam; + +public class MoneyQuery extends PageParam { + public String appCode; + public Integer status; +} diff --git a/game-service/src/main/java/awesome/group/game/service/bo/matrix/UserQuery.java b/game-service/src/main/java/awesome/group/game/service/bo/matrix/UserQuery.java new file mode 100644 index 0000000..e841dc4 --- /dev/null +++ b/game-service/src/main/java/awesome/group/game/service/bo/matrix/UserQuery.java @@ -0,0 +1,8 @@ +package awesome.group.game.service.bo.matrix; + +import awesome.group.game.service.bo.PageParam; + +public class UserQuery extends PageParam { + public String appCode; + +} diff --git a/game-service/src/main/java/awesome/group/game/service/ScheduleService.java b/game-service/src/main/java/awesome/group/game/service/citrus/ScheduleService.java similarity index 97% rename from game-service/src/main/java/awesome/group/game/service/ScheduleService.java rename to game-service/src/main/java/awesome/group/game/service/citrus/ScheduleService.java index 785ca21..774b1ff 100644 --- a/game-service/src/main/java/awesome/group/game/service/ScheduleService.java +++ b/game-service/src/main/java/awesome/group/game/service/citrus/ScheduleService.java @@ -1,4 +1,4 @@ -package awesome.group.game.service; +package awesome.group.game.service.citrus; import awesome.group.game.dao.bean.MatrixMoneyRecord; import awesome.group.game.dao.mapper.MatrixMoneyRecordMapper; diff --git a/game-service/src/main/java/awesome/group/game/service/citrus/UserService.java b/game-service/src/main/java/awesome/group/game/service/citrus/UserService.java index 5345590..9123936 100644 --- a/game-service/src/main/java/awesome/group/game/service/citrus/UserService.java +++ b/game-service/src/main/java/awesome/group/game/service/citrus/UserService.java @@ -111,7 +111,7 @@ public class UserService { public UserBo getUser(Integer uid) { MatrixUser u = userMapper.selectById(uid); MatrixApp app = new MatrixApp(); - UserBo res = new UserBo(u); + UserBo res = new UserBo(u, false); if (!StringUtils.hasText(app.getUmeng())) { return res; } diff --git a/game-service/src/main/java/awesome/group/game/service/AdminDeviceService.java b/game-service/src/main/java/awesome/group/game/service/matrix/AdminDeviceService.java similarity index 99% rename from game-service/src/main/java/awesome/group/game/service/AdminDeviceService.java rename to game-service/src/main/java/awesome/group/game/service/matrix/AdminDeviceService.java index 807d4fd..fd72554 100644 --- a/game-service/src/main/java/awesome/group/game/service/AdminDeviceService.java +++ b/game-service/src/main/java/awesome/group/game/service/matrix/AdminDeviceService.java @@ -1,4 +1,4 @@ -package awesome.group.game.service; +package awesome.group.game.service.matrix; import awesome.group.game.dao.bean.*; import awesome.group.game.dao.mapper.*; diff --git a/game-service/src/main/java/awesome/group/game/service/AdminService.java b/game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java similarity index 99% rename from game-service/src/main/java/awesome/group/game/service/AdminService.java rename to game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java index d580d50..3cb5a8e 100644 --- a/game-service/src/main/java/awesome/group/game/service/AdminService.java +++ b/game-service/src/main/java/awesome/group/game/service/matrix/AdminService.java @@ -1,4 +1,4 @@ -package awesome.group.game.service; +package awesome.group.game.service.matrix; import awesome.group.game.dao.bean.*; import awesome.group.game.dao.mapper.*; diff --git a/game-service/src/main/java/awesome/group/game/service/AggregationService.java b/game-service/src/main/java/awesome/group/game/service/matrix/AggregationService.java similarity index 96% rename from game-service/src/main/java/awesome/group/game/service/AggregationService.java rename to game-service/src/main/java/awesome/group/game/service/matrix/AggregationService.java index 4ba8397..edec320 100644 --- a/game-service/src/main/java/awesome/group/game/service/AggregationService.java +++ b/game-service/src/main/java/awesome/group/game/service/matrix/AggregationService.java @@ -1,4 +1,4 @@ -package awesome.group.game.service; +package awesome.group.game.service.matrix; import awesome.group.game.dao.bean.MatrixAdvAggregation; import awesome.group.game.dao.mapper.MatrixAdvAggregationMapper; diff --git a/game-service/src/main/java/awesome/group/game/service/AggregationSubService.java b/game-service/src/main/java/awesome/group/game/service/matrix/AggregationSubService.java similarity index 98% rename from game-service/src/main/java/awesome/group/game/service/AggregationSubService.java rename to game-service/src/main/java/awesome/group/game/service/matrix/AggregationSubService.java index 01927bd..d7b73f4 100644 --- a/game-service/src/main/java/awesome/group/game/service/AggregationSubService.java +++ b/game-service/src/main/java/awesome/group/game/service/matrix/AggregationSubService.java @@ -1,4 +1,4 @@ -package awesome.group.game.service; +package awesome.group.game.service.matrix; import awesome.group.game.dao.bean.MatrixAdvAggregationSub; import awesome.group.game.dao.mapper.MatrixAdvAggregationSubMapper; diff --git a/game-service/src/main/java/awesome/group/game/service/matrix/MatrixMoneyService.java b/game-service/src/main/java/awesome/group/game/service/matrix/MatrixMoneyService.java new file mode 100644 index 0000000..ee5f94d --- /dev/null +++ b/game-service/src/main/java/awesome/group/game/service/matrix/MatrixMoneyService.java @@ -0,0 +1,73 @@ +package awesome.group.game.service.matrix; + +import awesome.group.game.dao.bean.MatrixApp; +import awesome.group.game.dao.bean.MatrixMoneyRecord; +import awesome.group.game.dao.bean.MatrixUser; +import awesome.group.game.dao.mapper.MatrixAppMapper; +import awesome.group.game.dao.mapper.MatrixMoneyRecordMapper; +import awesome.group.game.dao.mapper.MatrixUserMapper; +import awesome.group.game.service.bo.PageResult; +import awesome.group.game.service.bo.citrus.UserBo; +import awesome.group.game.service.bo.matrix.MoneyBo; +import awesome.group.game.service.bo.matrix.MoneyQuery; +import awesome.group.game.service.common.exception.PaganiException; +import awesome.group.game.service.common.exception.PaganiExceptionCode; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +@Service +public class MatrixMoneyService { + + @Autowired + private MatrixMoneyRecordMapper moneyRecordMapper; + + @Autowired + private MatrixAppMapper appMapper; + + @Autowired + private MatrixUserService matrixUserService; + + @Autowired + private AdminService adminService; + + public static final int AUDIT_FAIL= -2; + public static final int AUDIT_SUCCESS= -1; + + public PageResult list(MoneyQuery query) { + MatrixApp app = appMapper.queryByCode(query.appCode); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MatrixMoneyRecord::getAppId, app.getId()); + if (query.status != null) { + wrapper.eq(MatrixMoneyRecord::getStatus, query.status); + } + wrapper.orderByDesc(MatrixMoneyRecord::getId); + int page = query.current; + int pageSize = query.pageSize; + IPage iPage = moneyRecordMapper.selectPage(new Page<>(page, pageSize), wrapper); + PageResult res = new PageResult<>(); + res.total = iPage.getTotal(); + List records = iPage.getRecords(); + List uids = records.stream().map(MatrixMoneyRecord::getUserId).toList(); + Map uMap = matrixUserService.getUser(uids); + res.data = records.stream().map(r -> new MoneyBo(uMap.get(r.getUserId()), r, true)).toList(); + return res; + } + + public void setStatus(Integer id, int status, String reason, Integer adminId) { + Assert.isTrue(Arrays.asList(AUDIT_FAIL, AUDIT_SUCCESS).contains(status), "非法请求"); + MatrixMoneyRecord record = moneyRecordMapper.selectById(id); + List appIds = adminService.getAdminAppIds(adminId); + if (!appIds.contains(record.getAppId())) { + throw new PaganiException(PaganiExceptionCode.GENERAL_ERROR, "非法请求，多次操作将被封号"); + } + moneyRecordMapper.updateStatusAndReason(id, status, reason); + } +} diff --git a/game-service/src/main/java/awesome/group/game/service/matrix/MatrixUserService.java b/game-service/src/main/java/awesome/group/game/service/matrix/MatrixUserService.java new file mode 100644 index 0000000..48da696 --- /dev/null +++ b/game-service/src/main/java/awesome/group/game/service/matrix/MatrixUserService.java @@ -0,0 +1,54 @@ +package awesome.group.game.service.matrix; + +import awesome.group.game.dao.bean.MatrixApp; +import awesome.group.game.dao.bean.MatrixUser; +import awesome.group.game.dao.mapper.MatrixAppMapper; +import awesome.group.game.dao.mapper.MatrixUserMapper; +import awesome.group.game.service.bo.PageResult; +import awesome.group.game.service.bo.citrus.UserBo; +import awesome.group.game.service.bo.matrix.UserQuery; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class MatrixUserService { + @Autowired + private MatrixUserMapper userMapper; + + @Autowired + private MatrixAppMapper appMapper; + + public PageResult list(UserQuery query) { + MatrixApp app = appMapper.queryByCode(query.appCode); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MatrixUser::getAppId, app.getId()); + + int page = query.current; + int pageSize = query.pageSize; + wrapper.orderByDesc(MatrixUser::getId); + IPage iPage = userMapper.selectPage(new Page<>(page, pageSize), wrapper); + PageResult res = new PageResult<>(); + res.total = iPage.getTotal(); + res.data = iPage.getRecords().stream().map(u -> new UserBo(u, true)).toList(); + return res; + } + + public Map getUser(List uidList) { + if (CollectionUtils.isEmpty(uidList)) { + return new HashMap<>(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(MatrixUser::getId, uidList); + List list = userMapper.selectList(wrapper); + return list.stream().collect(Collectors.toMap(MatrixUser::getId, x -> x)); + } +} diff --git a/game-service/src/main/java/awesome/group/game/service/OSSService.java b/game-service/src/main/java/awesome/group/game/service/matrix/OSSService.java similarity index 99% rename from game-service/src/main/java/awesome/group/game/service/OSSService.java rename to game-service/src/main/java/awesome/group/game/service/matrix/OSSService.java index 0fb8bf9..a0e83a8 100644 --- a/game-service/src/main/java/awesome/group/game/service/OSSService.java +++ b/game-service/src/main/java/awesome/group/game/service/matrix/OSSService.java @@ -1,4 +1,4 @@ -package awesome.group.game.service; +package awesome.group.game.service.matrix; import awesome.group.game.service.bo.STSInfo; import awesome.group.game.service.cache.CacheKey; diff --git a/game-service/src/test/java/awesome/group/game/service/AdminServiceTest.java b/game-service/src/test/java/awesome/group/game/service/AdminServiceTest.java index cfe73a7..c2b30d1 100644 --- a/game-service/src/test/java/awesome/group/game/service/AdminServiceTest.java +++ b/game-service/src/test/java/awesome/group/game/service/AdminServiceTest.java @@ -1,5 +1,7 @@ package awesome.group.game.service; +import awesome.group.game.service.matrix.AdminDeviceService; +import awesome.group.game.service.matrix.AdminService; import awesome.group.game.service.util.DateUtil; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java b/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java index 4981d2e..b4c6e88 100644 --- a/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java +++ b/game-web/src/main/java/awesome/group/game/web/controller/MatrixController.java @@ -1,6 +1,6 @@ package awesome.group.game.web.controller; -import awesome.group.game.service.AdminDeviceService; +import awesome.group.game.service.matrix.AdminDeviceService; import awesome.group.game.service.bo.MatrixAdvRecordSimple; import awesome.group.game.web.RequestContext; import awesome.group.game.web.aop.RestApi; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java index 9c0686d..27dd1e6 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/AdminController.java @@ -4,9 +4,9 @@ import awesome.group.game.dao.bean.MatrixAdmin; import awesome.group.game.dao.bean.MatrixApp; import awesome.group.game.dao.bean.MatrixMockSchedule; import awesome.group.game.dao.bean.MatrixWhiteDevice; -import awesome.group.game.service.AdminService; +import awesome.group.game.service.matrix.AdminService; import awesome.group.game.service.MatrixService; -import awesome.group.game.service.OSSService; +import awesome.group.game.service.matrix.OSSService; import awesome.group.game.service.bo.*; import awesome.group.game.service.bo.matrix.MatrixAppBo; import awesome.group.game.service.common.response.R; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java index e40a2f5..8e15003 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/DeviceController.java @@ -1,7 +1,7 @@ package awesome.group.game.web.rest.matrix; import awesome.group.game.dao.bean.MatrixAdminDevice; -import awesome.group.game.service.AdminDeviceService; +import awesome.group.game.service.matrix.AdminDeviceService; import awesome.group.game.service.bo.DateIncome; import awesome.group.game.service.bo.IncomeQuery; import awesome.group.game.service.bo.OverviewBo; diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java index 8365d2e..dff6f63 100644 --- a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixAppConfigController.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/api/matrix/app") +@RequestMapping("/api/admin/app") public class MatrixAppConfigController { @Autowired diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java new file mode 100644 index 0000000..a193b6c --- /dev/null +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixMoneyController.java @@ -0,0 +1,34 @@ +package awesome.group.game.web.rest.matrix; + +import awesome.group.game.service.bo.PageResult; +import awesome.group.game.service.bo.matrix.MoneyBo; +import awesome.group.game.service.bo.matrix.MoneyQuery; +import awesome.group.game.service.common.response.R; +import awesome.group.game.service.matrix.MatrixMoneyService; +import awesome.group.game.web.RequestContext; +import awesome.group.game.web.aop.RestApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/admin/money") +public class MatrixMoneyController { + @Autowired + private MatrixMoneyService matrixMoneyService; + + @PostMapping("/list") + @RestApi + public R> moneyApplyList(@RequestBody MoneyQuery query) { + return new R<>(matrixMoneyService.list(query)); + } + + @PostMapping("/audit") + @RestApi + public R audit(@RequestBody MoneyBo moneyBo) { + matrixMoneyService.setStatus(moneyBo.id, moneyBo.status, moneyBo.reason, RequestContext.getAdminID()); + return new R<>(null); + } +} diff --git a/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java new file mode 100644 index 0000000..f186988 --- /dev/null +++ b/game-web/src/main/java/awesome/group/game/web/rest/matrix/MatrixUserController.java @@ -0,0 +1,23 @@ +package awesome.group.game.web.rest.matrix; + +import awesome.group.game.service.bo.PageResult; +import awesome.group.game.service.bo.citrus.UserBo; +import awesome.group.game.service.bo.matrix.UserQuery; +import awesome.group.game.service.common.response.R; +import awesome.group.game.service.matrix.MatrixUserService; +import awesome.group.game.web.aop.RestApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/admin/user") +public class MatrixUserController { + @Autowired + private MatrixUserService userService; + + @PostMapping("/list") + @RestApi + public R> list(@RequestBody UserQuery query) { + return new R<>(userService.list(query)); + } +}