Merge branch 'milestone-20250727-金币重构三期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250727-金币重构三期

pom.xml

@@ -185,7 +185,7 @@
         <profile>
             <id>prod</id>
             <properties>
-                <spring.profiles.active>pro</spring.profiles.active>
+                <spring.profiles.active>prod</spring.profiles.active>
             </properties>
         </profile>
     </profiles>

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");
     }
 }

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<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                    if(!markets.contains("1")) {
-                        page.getConsumeUser().setMarkets(markets);
+                    if (admin != null) {
+                        List<String> 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<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                if(!markets.contains("1")) {
-                    consumeUser.setMarkets(markets);
+                if (admin != null) {
+                    List<String> list = Arrays.asList(admin.getMarkets().split(","));
+                    consumeUser.setMarkets(list);
+                }
+                else{
+                    return Result.error("角色为空");
                 }
             }
             Gold gold = consumeService.statsGold(consumeUser);

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);
+                    if (admin != null) {
                         List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
-                    if(!markets.contains("1")) {
                         page.getRechargeUser().setMarkets(markets);
                     }
                 }
@@ -106,10 +106,8 @@ public class RechargeController {
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                 List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));;
-                if(!markets.contains("1")) {
                 rechargeUser.setMarkets(markets);
             }
-            }
             Gold gold = rechargeService.statsGold(rechargeUser);
             return Result.success(gold);
         } catch (Exception e) {

src/main/java/com/example/demo/controller/coin/RefundController.java

@@ -79,11 +79,8 @@ public class RefundController {
                     String token = request.getHeader("token");
                     Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                     List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                    if(!markets.contains("1")) {
                     page.getRefundUser().setMarkets(markets);
                 }
-                }
                 return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser()));
             }
         } catch (Exception e) {
@@ -102,11 +99,8 @@ public class RefundController {
                 String token = request.getHeader("token");
                 Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
                 List<String> markets = Arrays.asList(StringUtils.split(admin.getMarkets(), ","));
-
-                if(!markets.contains("1")) {
                 refundUser.setMarkets(markets);
             }
-            }
             Gold gold = refundService.statsGold(refundUser);
             return Result.success(gold);
         } catch (Exception e) {

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

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

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) {    //通过
 
             //判断是充值还是退款

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;
 

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
 

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:

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:

src/main/resources/mapper/GoldDetailMapper.xml

@@ -7,11 +7,12 @@
     </insert>
 
     <select id="getGoldDetail" resultType="com.example.demo.domain.vo.coin.GoldDetail">
-        select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time,
+        select `user`.name, `user`.jwcode, m.name as market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time,
         `ugr`.free_june+`ugr`.free_december as free_gold
         from user_gold_record ugr
         left join `user` on `user`.jwcode = `ugr`.jwcode
         left join `admin` on `admin`.id = `ugr`.admin_id
+        left join market m on m.id=`user`.market
         <where>
             ugr.flag = 1 and
              ugr.audit_status IN (1,3)

src/main/resources/mapper/UserMapper.xml

@@ -57,10 +57,10 @@
     <where>
         jwcode = #{jwcode}
         <!-- 判断 market 是否不为总部且 markets 不为空 -->
-        <if test="markets != null and markets.size() > 0 and '1' not in markets">
+        <if test="markets != null and markets.size() > 0 and '9999' not in markets and '9' not in markets">
             AND (
             <foreach collection="markets" item="market" open="" close="" separator=" OR ">
-                market LIKE CONCAT('%', #{market}, '%')
+                u.market = #{market}
             </foreach>
             )
         </if>