From 9b8f17a36cbda4e74fc109caf94dde7295d3e4c9 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Wed, 9 Apr 2025 14:20:58 +0800 Subject: [PATCH] =?UTF-8?q?4.9=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=9C=B0=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/OneController.java | 46 ++++-- .../java/com/example/demo/mapper/OneMapper.java | 8 +- .../example/demo/serviceImpl/AuditServiceImpl.java | 4 +- .../example/demo/serviceImpl/OneServiceImpl.java | 14 +- .../java/com/example/demo/sevice/OneService.java | 9 +- src/main/resources/application.yml | 23 ++- src/main/resources/mapper/OneMapper.xml | 180 ++++++++++++++++++--- 7 files changed, 226 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/example/demo/controller/OneController.java b/src/main/java/com/example/demo/controller/OneController.java index 7f6a5ac..6227f38 100644 --- a/src/main/java/com/example/demo/controller/OneController.java +++ b/src/main/java/com/example/demo/controller/OneController.java @@ -1,16 +1,14 @@ package com.example.demo.controller; - import com.example.demo.domain.work.One; import com.example.demo.domain.work.Three; import com.example.demo.domain.work.Two; import com.example.demo.sevice.OneService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/One") @@ -19,16 +17,42 @@ import org.springframework.web.bind.annotation.RestController; @CrossOrigin public class OneController { private final OneService oneService; + + // 定义一个DTO类来封装请求参数 + public static class RequestParams { + private String token; + private List areas; + + // Getter和Setter方法 + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public List getAreas() { + return areas; + } + + public void setAreas(List areas) { + this.areas = areas; + } + } + @PostMapping("/getOne") - public One getOne() throws Exception { - return oneService.getOne(); + public One getOne(@RequestBody RequestParams requestParams) throws Exception { + return oneService.getOne(requestParams.getToken(), requestParams.getAreas()); } + @PostMapping("/getTwo") - public Two getTwo() throws Exception { - return oneService.getTwo(); + public Two getTwo(@RequestBody RequestParams requestParams) throws Exception { + return oneService.getTwo(requestParams.getToken(), requestParams.getAreas()); } + @PostMapping("/getThree") - public Three getThree() throws Exception { - return oneService.getThree(); + public Three getThree(@RequestBody RequestParams requestParams) throws Exception { + return oneService.getThree(requestParams.getToken(), requestParams.getAreas()); } } diff --git a/src/main/java/com/example/demo/mapper/OneMapper.java b/src/main/java/com/example/demo/mapper/OneMapper.java index 2dcb207..001d78e 100644 --- a/src/main/java/com/example/demo/mapper/OneMapper.java +++ b/src/main/java/com/example/demo/mapper/OneMapper.java @@ -6,9 +6,11 @@ import com.example.demo.domain.work.Three; import com.example.demo.domain.work.Two; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface OneMapper { - One getOne() throws Exception; - Two getTwo() throws Exception; - Three getThree() throws Exception; + One getOne(List areas) throws Exception; + Two getTwo(List areas) throws Exception; + Three getThree(List areas) throws Exception; } diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 2880700..a4cf37f 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -145,10 +145,10 @@ public class AuditServiceImpl implements AuditService { System.out.println(detailY); // result = detailYMapper.add(detailY); if(paidGold != null && paidGold.compareTo(BigDecimal.ZERO) != 0) { - GoldTistV2.addCoinNew(jwcode, 64, paidGold.doubleValue(), remark, 0, name, "金币充值"); + GoldTistV2.addCoinNew(jwcode, 64, paidGold.doubleValue()/100, remark, 0, name, "金币充值"); } if(freeGold != null && freeGold.compareTo(BigDecimal.ZERO) != 0) { - GoldTistV2.addCoinNew(jwcode, 63, freeGold.doubleValue(), remark, 0, name, "金币充值 "); + GoldTistV2.addCoinNew(jwcode, 63, freeGold.doubleValue()/100, remark, 0, name, "金币充值 "); } } return auditMapper.update(audit); diff --git a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java index 6c17d3e..9b3417d 100644 --- a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java @@ -8,22 +8,24 @@ import com.example.demo.sevice.OneService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class OneServiceImpl implements OneService { @Autowired private OneMapper oneMapper; @Override - public One getOne() throws Exception { - return oneMapper.getOne(); + public One getOne(String token,List areas) throws Exception { + return oneMapper.getOne(areas); } @Override - public Two getTwo() throws Exception { - return oneMapper.getTwo(); + public Two getTwo(String token,List areas) throws Exception { + return oneMapper.getTwo(areas); } @Override - public Three getThree() throws Exception { - return oneMapper.getThree(); + public Three getThree(String token,List areas) throws Exception { + return oneMapper.getThree(areas); } } diff --git a/src/main/java/com/example/demo/sevice/OneService.java b/src/main/java/com/example/demo/sevice/OneService.java index 152a803..9b94af0 100644 --- a/src/main/java/com/example/demo/sevice/OneService.java +++ b/src/main/java/com/example/demo/sevice/OneService.java @@ -3,9 +3,12 @@ package com.example.demo.sevice; import com.example.demo.domain.work.One; import com.example.demo.domain.work.Three; import com.example.demo.domain.work.Two; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; public interface OneService { - One getOne() throws Exception; - Two getTwo() throws Exception; - Three getThree() throws Exception; + One getOne(String token, List areas) throws Exception; + Two getTwo(String token,List areas) throws Exception; + Three getThree(String token,List areas) throws Exception; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f35c424..44e4449 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,18 +12,17 @@ spring: max-file-size: 10MB max-request-size: 100MB datasource: - hikari: - maximum-pool-size: 10 - minimum-idle: 5 - idle-timeout: 30000 - max-lifetime: 1800000 - connection-timeout: 30000 - pool-name: HwgoldHikariCP - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai -# url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai - username: hwgold - password: 'AGX4Z3YMxiCG3GR2' + hikari: + maximum-pool-size: 10 + minimum-idle: 5 + idle-timeout: 30000 + max-lifetime: 1800000 + connection-timeout: 30000 + pool-name: HwgoldHikariCP + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai + username: hwgold + password: 'AGX4Z3YMxiCG3GR2' application: name: demo cache: diff --git a/src/main/resources/mapper/OneMapper.xml b/src/main/resources/mapper/OneMapper.xml index 7453b07..7c7c583 100644 --- a/src/main/resources/mapper/OneMapper.xml +++ b/src/main/resources/mapper/OneMapper.xml @@ -9,25 +9,79 @@ SELECT COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) FROM detail_y - WHERE DATE(create_time) = CURDATE()), 0) AS differr, + WHERE DATE(create_time) = CURDATE() + + AND area IN + + #{areas} + + ), 0) AS differr, COALESCE((SELECT SUM(free_6 + free_12 + core_jb + buy_jb) - FROM user_gold), 0) AS sumgold, + FROM user_gold + left join user on user.jwcode = user_gold.jwcode + + area IN + + #{areas} + + + ), 0) AS sumgold, COALESCE((SELECT SUM(buy_jb) - FROM user_gold), 0) AS rechargegold, + FROM user_gold + left join user on user.jwcode = user_gold.jwcode + + area IN + + #{areas} + + + ), 0) AS rechargegold, COALESCE((SELECT SUM(free_6) - FROM user_gold), 0) AS sfreegold, + FROM user_gold + left join user on user.jwcode = user_gold.jwcode + + area IN + + #{areas} + + + ), 0) AS sfreegold, COALESCE((SELECT SUM(free_12) - FROM user_gold), 0) AS dfreegold, + FROM user_gold + left join user on user.jwcode = user_gold.jwcode + + area IN + + #{areas} + + + ), 0) AS dfreegold, COALESCE((SELECT SUM(core_jb) - FROM user_gold), 0) AS taskgold, + FROM user_gold + left join user on user.jwcode = user_gold.jwcode + + area IN + + #{areas} + + + ), 0) AS taskgold, COALESCE((SELECT SUM(free_6) + SUM(free_12) - FROM user_gold), 0) AS freegold; + FROM user_gold + left join user on user.jwcode = user_gold.jwcode + + area IN + + #{areas} + + + ), 0) AS freegold; @@ -36,34 +90,76 @@ COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 0), 0) AS totalgold, + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS totalgold, COALESCE((SELECT SUM(recharge_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 0), 0) AS totalcoin, + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS totalcoin, COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) FROM detail_y WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) - AND update_type = 0), 0) AS yesterdaytotal, + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS yesterdaytotal, COALESCE((SELECT SUM(recharge_coin) FROM detail_y WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) - AND update_type = 0), 0) AS yesterdayrecharge, + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS yesterdayrecharge, COALESCE((SELECT SUM(recharge_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 0), 0) AS rechargegold, + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS rechargegold, COALESCE((SELECT SUM(free_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 0), 0) AS freegold, + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS freegold, COALESCE((SELECT SUM(task_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 0), 0) AS taskgold + AND update_type = 0 + + AND area IN + + #{areas} + + ), 0) AS taskgold @@ -72,33 +168,75 @@ COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 1), 0) AS consumeGold, + AND update_type = 1 + + AND area IN + + #{areas} + + ), 0) AS consumeGold, COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 2), 0) AS refundcoin, + AND update_type = 2 + + AND area IN + + #{areas} + + ), 0) AS refundcoin, COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) FROM detail_y WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) - AND update_type = 1), 0) AS yesterdayGold, + AND update_type = 1 + + AND area IN + + #{areas} + + ), 0) AS yesterdayGold, COALESCE((SELECT SUM(recharge_coin) FROM detail_y WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) - AND update_type = 2), 0) AS yesterdayrefund, + AND update_type = 2 + + AND area IN + + #{areas} + + ), 0) AS yesterdayrefund, COALESCE((SELECT SUM(recharge_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 1), 0) AS rechargegold, + AND update_type = 1 + + AND area IN + + #{areas} + + ), 0) AS rechargegold, COALESCE((SELECT SUM(task_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 1), 0) AS taskgold, + AND update_type = 1 + + AND area IN + + #{areas} + + ), 0) AS taskgold, COALESCE((SELECT SUM(free_coin) FROM detail_y WHERE YEAR(create_time) = YEAR(CURDATE()) - AND update_type = 1), 0) AS freegold + AND update_type = 1 + + AND area IN + + #{areas} + + ), 0) AS freegold \ No newline at end of file