diff --git a/pom.xml b/pom.xml index 66e00de..4ee89f5 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ prod - pro + prod diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index 44717c9..6440a93 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -231,9 +231,9 @@ public class ExportServiceImpl implements ExportService { } else if (dto instanceof ArticleDTO articleDTO) { requestData.put(requestDataKey, articleDTO.getBeanConsumeArticle()); } else if (dto instanceof BeanRechargeDTO beanRechargeDTO){ - requestData.put(requestDataKey, beanRechargeDTO.getBeanRechargeInfo()); + requestData.put(requestDataKey, beanRechargeDTO.getBeanSystemRechargeInfo()); } else if (dto instanceof OnlineDTO onlineDTO){ - requestData.put(requestDataKey, onlineDTO.getBeanRechargeInfo()); + requestData.put(requestDataKey, onlineDTO.getBeanOnlineRechargeInfo()); } exportData.put("requestData", requestData); @@ -282,11 +282,11 @@ public class ExportServiceImpl implements ExportService { @Override public Result addExportBean(BeanRechargeDTO dto) { - return addExport(dto, "金豆明细", "bean:queue:export_queue", "beanRechargeInfo"); + return addExport(dto, "金豆明细", "bean:queue:export_queue", "beanSystemRechargeInfo"); } @Override public Result addExportOnline(OnlineDTO dto) { - return addExport(dto, "在线明细", "online:queue:export_queue", "beanRechargeInfo"); + return addExport(dto, "在线明细", "online:queue:export_queue", "beanOnlineRechargeInfo"); } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/controller/coin/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java index e07de1d..95bf0a1 100644 --- a/src/main/java/com/example/demo/controller/coin/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java @@ -90,10 +90,12 @@ public class ConsumeController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); - List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - - if(!markets.contains("1")) { - page.getConsumeUser().setMarkets(markets); + if (admin != null) { + List list = Arrays.asList(admin.getMarkets().split(",")); + page.getConsumeUser().setMarkets(list); + } + else{ + return Result.error("角色为空"); } } return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser())); @@ -113,10 +115,12 @@ public class ConsumeController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); - List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - - if(!markets.contains("1")) { - consumeUser.setMarkets(markets); + if (admin != null) { + List list = Arrays.asList(admin.getMarkets().split(",")); + consumeUser.setMarkets(list); + } + else{ + return Result.error("角色为空"); } } Gold gold = consumeService.statsGold(consumeUser); diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java index 7fcbfa2..08c00b1 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java @@ -83,8 +83,8 @@ public class RechargeController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); - List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));; - if(!markets.contains("1")) { + if (admin != null) { + List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));; page.getRechargeUser().setMarkets(markets); } } @@ -106,9 +106,7 @@ public class RechargeController { String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));; - if(!markets.contains("1")) { - rechargeUser.setMarkets(markets); - } + rechargeUser.setMarkets(markets); } Gold gold = rechargeService.statsGold(rechargeUser); return Result.success(gold); diff --git a/src/main/java/com/example/demo/controller/coin/RefundController.java b/src/main/java/com/example/demo/controller/coin/RefundController.java index ef1f6ba..0181d23 100644 --- a/src/main/java/com/example/demo/controller/coin/RefundController.java +++ b/src/main/java/com/example/demo/controller/coin/RefundController.java @@ -79,10 +79,7 @@ public class RefundController { String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - - if(!markets.contains("1")) { - page.getRefundUser().setMarkets(markets); - } + page.getRefundUser().setMarkets(markets); } return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser())); } @@ -102,10 +99,7 @@ public class RefundController { String token = request.getHeader("token"); Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); List markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ",")); - - if(!markets.contains("1")) { - refundUser.setMarkets(markets); - } + refundUser.setMarkets(markets); } Gold gold = refundService.statsGold(refundUser); return Result.success(gold); diff --git a/src/main/java/com/example/demo/domain/DTO/BeanRechargeDTO.java b/src/main/java/com/example/demo/domain/DTO/BeanRechargeDTO.java index 99a0ae7..71a243a 100644 --- a/src/main/java/com/example/demo/domain/DTO/BeanRechargeDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/BeanRechargeDTO.java @@ -2,6 +2,7 @@ package com.example.demo.domain.DTO; import com.example.demo.domain.vo.bean.BeanConsumeArticle; import com.example.demo.domain.vo.bean.BeanRechargeInfo; +import com.example.demo.domain.vo.bean.BeanSystemRechargeInfo; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; @@ -33,5 +34,5 @@ public class BeanRechargeDTO { private Integer page = 1; @NotNull(message = "pageSize不能为空") private Integer pageSize = 20; - private BeanRechargeInfo beanRechargeInfo; + private BeanSystemRechargeInfo beanSystemRechargeInfo; } diff --git a/src/main/java/com/example/demo/domain/DTO/OnlineDTO.java b/src/main/java/com/example/demo/domain/DTO/OnlineDTO.java index 3247e86..b775884 100644 --- a/src/main/java/com/example/demo/domain/DTO/OnlineDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/OnlineDTO.java @@ -32,5 +32,5 @@ public class OnlineDTO { private Integer page = 1; @NotNull(message = "pageSize不能为空") private Integer pageSize = 20; - private BeanOnlineRechargeInfo beanRechargeInfo; + private BeanOnlineRechargeInfo beanOnlineRechargeInfo; } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index f9a377a..c814028 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -69,13 +69,13 @@ public class AuditServiceImpl implements AuditService { auditMapper.updateOrderRefund(consumeOrderCode,(byte)0); }else { throw new IllegalArgumentException("找不到对应的订单或不是有效订单"); - } + } } updateOrder.setAuditStatus(2); updateOrder.setRejectReason(rejectReason); updateOrder.setAuditTime(new Date()); // 执行审核更新 auditMapper.updateOrder(updateOrder); - } + }else if (action==1) { //通过 //判断是充值还是退款 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index 1ceee59..f3f112c 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -32,6 +32,7 @@ import com.example.demo.service.coin.AiEmotionService; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.xmlbeans.impl.xb.xsdschema.Attribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationManager; @@ -87,6 +88,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception handleExcelExportData(String message) throws Exception { return exportExcelGeneric(message, "goldDetail", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode GoldDetailNode = requestDataNode.path("goldDetail"); + GoldDetail goldDetail = objectMapper.treeToValue(GoldDetailNode, GoldDetail.class); + page.setGoldDetail(goldDetail); return goldDetailController.ExcelGoldDetail(page); } catch (Exception e) { throw new RuntimeException(e); @@ -99,6 +105,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception handleExcel(String message) throws Exception { return exportExcelGeneric(message, "user", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode UserNode = requestDataNode.path("user"); + User user = objectMapper.treeToValue(UserNode, User.class); + page.setUser(user); return goldDetailController.ExcelGold(page); } catch (Exception e) { throw new RuntimeException(e); @@ -111,6 +122,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception rechargeExcel(String message) throws Exception { return exportExcelGeneric(message, "rechargeUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode rechargeUserNode = requestDataNode.path("rechargeUser"); + RechargeUser rechargeUser = objectMapper.treeToValue(rechargeUserNode, RechargeUser.class); + page.setRechargeUser(rechargeUser); return rechargeController.selcet(page); } catch (Exception e) { throw new RuntimeException(e); @@ -122,6 +138,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception consumeExcel(String message) throws Exception { return exportExcelGeneric(message, "consumeUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode consumeUserNode = requestDataNode.path("consumeUser"); + ConsumeUser consumeUser = objectMapper.treeToValue(consumeUserNode, ConsumeUser.class); + page.setConsumeUser(consumeUser); return consumeController.select(page); } catch (Exception e) { throw new RuntimeException(e); @@ -134,6 +155,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception refundExcel(String message) throws Exception { return exportExcelGeneric(message, "refundUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode refundUserNode = requestDataNode.path("refundUser"); + RefundUser refundUser = objectMapper.treeToValue(refundUserNode, RefundUser.class); + page.setRefundUser(refundUser); return refundController.selcet(page); } catch (Exception e) { throw new RuntimeException(e); @@ -145,6 +171,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception LiveExcel(String message) throws Exception { return exportExcelGeneric(message, "liveUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanConsumeLiveNode = requestDataNode.path("beanConsumeLive"); + BeanConsumeLive beanConsumeLive = objectMapper.treeToValue(beanConsumeLiveNode, BeanConsumeLive.class); + page.setBeanConsumeLive(beanConsumeLive); return beanConsumeController.selectLiveBy(page); } catch (Exception e) { throw new RuntimeException(e); @@ -156,6 +187,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception FanExcel(String message) throws Exception { return exportExcelGeneric(message, "fanUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanConsumeFanNode = requestDataNode.path("beanConsumeFan"); + BeanConsumeFan beanConsumeFan = objectMapper.treeToValue(beanConsumeFanNode, BeanConsumeFan.class); + page.setBeanConsumeFan(beanConsumeFan); return beanConsumeController.selectFanBy(page); } catch (Exception e) { throw new RuntimeException(e); @@ -167,6 +203,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception ArticleExcel(String message) throws Exception { return exportExcelGeneric(message, "articleUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanConsumeArticleNode = requestDataNode.path("beanConsumeArticle"); + BeanConsumeArticle beanConsumeArticle = objectMapper.treeToValue(beanConsumeArticleNode, BeanConsumeArticle.class); + page.setBeanConsumeArticle(beanConsumeArticle); return beanConsumeController.selectArticleBy(page); } catch (Exception e) { throw new RuntimeException(e); @@ -177,6 +218,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception BeanExcel(String message) throws Exception { return exportExcelGeneric(message, "beanUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanRechargeNode = requestDataNode.path("beanSystemRechargeInfo"); + BeanSystemRechargeInfo beanSystemRechargeInfo = objectMapper.treeToValue(beanRechargeNode, BeanSystemRechargeInfo.class); + page.setBeanSystemRechargeInfo(beanSystemRechargeInfo); return beanRechargeController.selectBySystem(page); } catch (Exception e) { throw new RuntimeException(e); @@ -187,6 +233,11 @@ public class ExportExcelServiceImpl implements ExportExcelService { public Exception OnlineExcel(String message) throws Exception { return exportExcelGeneric(message, "onlineUser", page -> { try { + JsonNode rootNode = objectMapper.readTree(message); + JsonNode requestDataNode = rootNode.path("requestData"); + JsonNode beanRechargeNode = requestDataNode.path("beanOnlineRechargeInfo"); + BeanOnlineRechargeInfo beanOnlineRechargeInfo = objectMapper.treeToValue(beanRechargeNode, BeanOnlineRechargeInfo.class); + page.setBeanOnlineRechargeInfo(beanOnlineRechargeInfo); return beanRechargeController.selectByOnline(page); } catch (Exception e) { throw new RuntimeException(e); @@ -261,6 +312,9 @@ public class ExportExcelServiceImpl implements ExportExcelService { Page page = new Page(); page.setPageNum(1); page.setPageSize(PAGE_SIZE); + if (exportType.equals("goldDetail")){ + + } Integer totalCount = 0; boolean hasMore = true; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index ceeecca..6cd6553 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: fail-on-unknown-properties: false datasource: mysql1: - jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true + jdbc-url: jdbc:mysql://localhost:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true username: hwgoldc password: zB48T55wCsHC8KPz driver-class-name: com.mysql.cj.jdbc.Driver @@ -35,7 +35,7 @@ spring: data: redis: database: 0 - host: 18.143.76.3 + host: localhost port: 10703 password: Ngc0FYUTA6h3wC5J diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 10fe60e..3b84df9 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -4,7 +4,7 @@ spring: fail-on-unknown-properties: false datasource: mysql1: - jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true + jdbc-url: jdbc:mysql://localhost:3306/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true username: hwgold password: aDiw7MERSATdfGta driver-class-name: com.mysql.cj.jdbc.Driver @@ -36,8 +36,8 @@ spring: redis: database: 2 host: localhost - port: 6379 - password: 123456 + port: 10703 + password: Ngc0FYUTA6h3wC5J lettuce: pool: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d2a2b71..e6ac979 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -4,7 +4,7 @@ spring: fail-on-unknown-properties: false datasource: mysql1: - jdbc-url: jdbc:mysql://18.143.76.3:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true + jdbc-url: jdbc:mysql://54.255.212.181:3306/hwgoldc?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&allowMultiQueries=true&rewriteBatchedStatements=true username: hwgoldc password: zB48T55wCsHC8KPz driver-class-name: com.mysql.cj.jdbc.Driver @@ -35,9 +35,9 @@ spring: data: redis: database: 0 - host: 18.143.76.3 - port: 10703 - password: Ngc0FYUTA6h3wC5J + host: localhost + port: 6379 + password: 123456 lettuce: pool: diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index a3bd91c..55676db 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -7,11 +7,12 @@