From e0d2073597118350faeb546312d8a86cf8ba2062 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Fri, 25 Apr 2025 10:44:09 +0800 Subject: [PATCH 01/20] =?UTF-8?q?4.25=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/DouController.java | 4 ++++ .../java/com/example/demo/domain/dou/Total.java | 28 ++++++++++++++++++++++ .../com/example/demo/mapperLink/DouMapper.java | 2 +- .../example/demo/serviceImpl/AuditServiceImpl.java | 2 +- .../example/demo/serviceImpl/DouServiceImpl.java | 5 ++++ .../java/com/example/demo/sevice/DouService.java | 2 ++ src/main/resources/mapperLink/DouMapper.xml | 23 ++++++++---------- src/main/resources/mapperPay/PayMapper.xml | 1 + 8 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/dou/Total.java diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java index 8429aa5..ae31530 100644 --- a/src/main/java/com/example/demo/controller/DouController.java +++ b/src/main/java/com/example/demo/controller/DouController.java @@ -110,4 +110,8 @@ public class DouController { public Result SearchPayIp(){ return Result.success(douService.SearchPayIp()); } + @RequestMapping("/getTotal") + public Result getTotal(@RequestBody Total total){ + return Result.success(douService.getTotal(total)); + } } diff --git a/src/main/java/com/example/demo/domain/dou/Total.java b/src/main/java/com/example/demo/domain/dou/Total.java new file mode 100644 index 0000000..25529dd --- /dev/null +++ b/src/main/java/com/example/demo/domain/dou/Total.java @@ -0,0 +1,28 @@ +package com.example.demo.domain.dou; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Total { + private String token; + private String jwcode; + private String orderNo; + private String type; + private String ipAddress; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; + private Integer count; + private Integer price; +} diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java index e3fb481..61b5c18 100644 --- a/src/main/java/com/example/demo/mapperLink/DouMapper.java +++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java @@ -18,6 +18,6 @@ public interface DouMapper { Integer getSpendTotal(SpendTotal spendTotal); List getPay(Pay pay); List getPayIp(); - RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal); + Total getTotal(Total total); } diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 654fc81..d6f9998 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -149,7 +149,7 @@ public class AuditServiceImpl implements AuditService { GoldTistV2.addCoinNew(jwcode, 64, paidGold.doubleValue()/100, remark, 0, name, "金币充值"); } if(freeGold != null && freeGold.compareTo(BigDecimal.ZERO) != 0) { - GoldTistV2.addCoinNew(jwcode, 63, freeGold.doubleValue()/100, 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/DouServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java index 0825de2..364d552 100644 --- a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java @@ -185,4 +185,9 @@ public class DouServiceImpl implements DouService { List list= payMapper.getPay(pay); return new PageInfo<>(list); } + + @Override + public Total getTotal(Total total) { + return douMapper.getTotal(total); + } } diff --git a/src/main/java/com/example/demo/sevice/DouService.java b/src/main/java/com/example/demo/sevice/DouService.java index 0dbfdf9..8577d1a 100644 --- a/src/main/java/com/example/demo/sevice/DouService.java +++ b/src/main/java/com/example/demo/sevice/DouService.java @@ -27,5 +27,7 @@ public interface DouService { List SearchStyle(); List SearchPayIp(); Object SearchPay(Integer pageNum, Integer pageSize, Pay pay); + Total getTotal(Total total); + } diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index 3fdbb36..474f54a 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -106,22 +106,19 @@ AND fm.ip_address = #{ipAddress} - - AND fy.source_name = #{sourceName} - AND fy.pay_type = #{payType} - AND fy.source_type = #{good} + AND fy.source_type = #{sourceType} AND FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime} ) AS subquery WHERE 1=1 - - AND room LIKE CONCAT('%', #{room}, '%') + + AND room LIKE CONCAT('%', #{sourceName}, '%') @@ -177,10 +174,10 @@ and fy.order_no = #{orderNo} - and type LIKE CONCAT('%', #{type}, '%') + and content LIKE CONCAT('%', #{type}, '%') - - and fm.ip_address = #{ipAddress} + + and fm.ip_address = #{deptName} and FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime} @@ -195,15 +192,15 @@ - SELECT - sum(money)/50 as priceTotal, - sum(money) as countTotal + sum(money)/50 as price, + sum(money) as count from fx_yaoqing_records as fy LEFT JOIN fx_member as fm on fy.uid = fm.id `data`=0 - + and fm.jwcode = #{jwcode} diff --git a/src/main/resources/mapperPay/PayMapper.xml b/src/main/resources/mapperPay/PayMapper.xml index 89b8469..8b3036b 100644 --- a/src/main/resources/mapperPay/PayMapper.xml +++ b/src/main/resources/mapperPay/PayMapper.xml @@ -45,6 +45,7 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode sum(count) as countTotal FROM g_order as go LEFT JOIN g_pay_style gps on go.pay_style=gps.id + LEFT JOIN member_info as mi on go.jwcode = mi.jwcode and go.jwcode = #{jwcode} From 9307b8672a174c59f1ecb8e8ab1105f3db804fb6 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sat, 26 Apr 2025 10:52:24 +0800 Subject: [PATCH 02/20] =?UTF-8?q?4.26=20=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=BB=98=E8=AE=A4=E5=8A=A0=E5=85=A5123=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java index fb08232..c8fa981 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java @@ -9,6 +9,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheConfig; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -58,6 +59,8 @@ public class UserServiceImpl implements UserSevice { if (!ObjectUtils.isEmpty(sUser)){ throw new Exception("已存在此用户"); } + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + user.setPassword(passwordEncoder.encode("123")); return userMapper.add(user); } From 8f62f0305cdcfef30889ca60eaa9b3ee935b378c Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sun, 27 Apr 2025 09:32:59 +0800 Subject: [PATCH 03/20] =?UTF-8?q?4.26=20=E4=BF=AE=E5=A4=8D=E9=87=91?= =?UTF-8?q?=E8=B1=86=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/dou/Total.java | 1 + .../com/example/demo/serviceImpl/OtherServiceImpl.java | 2 +- src/main/resources/mapper/StatisticsMapper.xml | 14 ++++++++++++++ src/main/resources/mapperLink/DouMapper.xml | 4 ++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/demo/domain/dou/Total.java b/src/main/java/com/example/demo/domain/dou/Total.java index 25529dd..e62325d 100644 --- a/src/main/java/com/example/demo/domain/dou/Total.java +++ b/src/main/java/com/example/demo/domain/dou/Total.java @@ -17,6 +17,7 @@ public class Total { private String orderNo; private String type; private String ipAddress; + private String deptName; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java index e4c5c4e..86b7c35 100644 --- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java @@ -98,9 +98,9 @@ public class OtherServiceImpl implements OtherService { typesToUpdateOne.add("43"); typesToUpdateOne.add("50"); typesToUpdateOne.add("51"); - typesToUpdateOne.add("52"); typesToUpdateOne.add("62"); + typesToUpdateTwo.add("52"); typesToUpdateTwo.add("55"); typesToUpdateTwo.add("56"); typesToUpdateTwo.add("57"); diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml index 1ba9f0c..17e0eb7 100644 --- a/src/main/resources/mapper/StatisticsMapper.xml +++ b/src/main/resources/mapper/StatisticsMapper.xml @@ -124,4 +124,18 @@ GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d') + \ No newline at end of file diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index 474f54a..17f614e 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -209,8 +209,8 @@ and type LIKE CONCAT('%', #{type}, '%') - - and fm.ip_address = #{ipAddress} + + and fm.ip_address = #{deptName} and FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime} From 35f6b254ecfb7007cb4fde98f24d6c2ecb16a7f3 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sun, 27 Apr 2025 15:53:07 +0800 Subject: [PATCH 04/20] =?UTF-8?q?4.26=20=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/DetailYMapper.xml | 2 +- src/main/resources/mapper/StatisticsMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml index 63a6a46..172d04c 100644 --- a/src/main/resources/mapper/DetailYMapper.xml +++ b/src/main/resources/mapper/DetailYMapper.xml @@ -179,7 +179,7 @@ types; + \ No newline at end of file diff --git a/src/main/resources/mapperPay/PayMapper.xml b/src/main/resources/mapperPay/PayMapper.xml index 8b3036b..ec7ecd5 100644 --- a/src/main/resources/mapperPay/PayMapper.xml +++ b/src/main/resources/mapperPay/PayMapper.xml @@ -4,7 +4,9 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> SELECT - COALESCE((SELECT SUM(recharge_coin + free_coin + task_coin) - FROM detail_y - WHERE YEAR(create_time) = YEAR(CURDATE()) - 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 - - 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 - - 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 - - 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 - - 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 - - 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 + COALESCE(SUM(CASE WHEN year_flag = 1 THEN total_coin ELSE 0 END), 0) AS totalgold, + COALESCE(SUM(CASE WHEN year_flag = 1 THEN recharge_coin ELSE 0 END), 0) AS totalcoin, + COALESCE(SUM(CASE WHEN yesterday_flag = 1 THEN total_coin ELSE 0 END), 0) AS yesterdaytotal, + COALESCE(SUM(CASE WHEN yesterday_flag = 1 THEN recharge_coin ELSE 0 END), 0) AS yesterdayrecharge, + COALESCE(SUM(CASE WHEN year_flag = 1 THEN recharge_coin ELSE 0 END), 0) AS rechargegold, + COALESCE(SUM(CASE WHEN year_flag = 1 THEN free_coin ELSE 0 END), 0) AS freegold, + COALESCE(SUM(CASE WHEN year_flag = 1 THEN task_coin ELSE 0 END), 0) AS taskgold + FROM ( + SELECT + recharge_coin, + free_coin, + task_coin, + recharge_coin + free_coin + task_coin AS total_coin, + YEAR(create_time) = YEAR(CURDATE()) AS year_flag, + DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) AS yesterday_flag + FROM detail_y + WHERE update_type = 0 AND area IN - #{areas} + #{area} - ), 0) AS taskgold + + ) AS subquery diff --git a/src/test/java/test.java b/src/test/java/test.java new file mode 100644 index 0000000..3e370fb --- /dev/null +++ b/src/test/java/test.java @@ -0,0 +1,3 @@ +public class test { + +} From 47b07b88bb6d9719c48cb33b5228b7b19f03d965 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 13 May 2025 11:09:24 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83a33d9..5014c79 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ mysql mysql-connector-java - 8.0.33 + 1209871247 From 004ed604726abe219a525b9e05a024f367042e00 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 13 May 2025 11:09:59 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E6=8B=89=E5=8F=96=E9=BB=84=E5=85=B6?= =?UTF-8?q?=E6=8C=AF=E4=BB=A3=E7=A0=81=E6=97=A0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5014c79..83a33d9 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ mysql mysql-connector-java - 1209871247 + 8.0.33 From e798942b946c9482c511ba5afae81a0791357ee9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 14 May 2025 08:20:52 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/DemoApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java index abca329..f38a3d7 100644 --- a/src/main/java/com/example/demo/DemoApplication.java +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -13,6 +13,7 @@ import org.springframework.cache.annotation.EnableCaching; @MapperScan(basePackages = "com.example.demo.mapper", sqlSessionTemplateRef = "mysql1SqlSessionTemplate") @MapperScan(basePackages = "com.example.demo.mapperLink", sqlSessionTemplateRef = "mysql2SqlSessionTemplate") @MapperScan(basePackages = "com.example.demo.mapperPay", sqlSessionTemplateRef = "mysql3SqlSessionTemplate") + public class DemoApplication { public static void main(String[] args) { From 9eea1134f16fa4b7a59f6617826818bfa37f7bbd Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 14 May 2025 16:16:03 +0800 Subject: [PATCH 10/20] =?UTF-8?q?5=E6=9C=8814=E6=97=A5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B6=88=E8=B4=B9=E7=BD=91=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/controller/DetailYController.java | 6 +++++- src/main/java/com/example/demo/controller/RechargeController.java | 3 ++- src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java | 6 +++++- src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java | 2 +- src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java | 4 +++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/controller/DetailYController.java b/src/main/java/com/example/demo/controller/DetailYController.java index d3ea307..bbfda8c 100644 --- a/src/main/java/com/example/demo/controller/DetailYController.java +++ b/src/main/java/com/example/demo/controller/DetailYController.java @@ -5,6 +5,7 @@ import com.example.demo.domain.entity.Detail; import com.example.demo.domain.entity.DetailY; import com.example.demo.domain.entity.UserDetailExport; import com.example.demo.domain.vo.*; +import com.example.demo.serviceImpl.DetailYServiceImpl; import com.example.demo.sevice.DetailService; import com.example.demo.sevice.DetailYService; //import com.example.demo.sevice.OtherService; @@ -24,7 +25,7 @@ import java.util.List; @Slf4j @CrossOrigin public class DetailYController { - private final DetailYService detailYService; + private final DetailYServiceImpl detailYService; private final OtherService otherService; @PostMapping("/add") public Result add(@RequestBody DetailY detailY) { @@ -42,6 +43,9 @@ public class DetailYController { return Result.success(detailYService.getCount(page.getDetailY())); } else { + System.out.println(page.getPageNum()); + System.out.println(page.getPageSize()); + System.out.println(page.getDetailY().getSortField()); return Result.success(detailYService.getDetailByPage(page.getPageNum(), page.getPageSize(), page.getDetailY())); } } diff --git a/src/main/java/com/example/demo/controller/RechargeController.java b/src/main/java/com/example/demo/controller/RechargeController.java index 7c2865e..f17ac70 100644 --- a/src/main/java/com/example/demo/controller/RechargeController.java +++ b/src/main/java/com/example/demo/controller/RechargeController.java @@ -5,6 +5,7 @@ import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.RechargeA; import com.example.demo.domain.vo.Result; //import com.example.demo.controller.KafkaProducer; +import com.example.demo.serviceImpl.RechargeServiceImpl; import com.example.demo.sevice.RechargeService; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,7 +30,7 @@ import java.util.stream.Collectors; @JsonIgnoreProperties(ignoreUnknown = true) public class RechargeController { - private final RechargeService rechargeService; + private final RechargeServiceImpl rechargeService; private final ObjectMapper objectMapper; // 添加这一行 // @Autowired // private KafkaProducer kafkaProducer; diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 0752996..a4dadf8 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.math.BigDecimal; import java.time.LocalDate; @@ -38,7 +39,10 @@ public class ConsumeServiceImpl implements ConsumeService { @Override //新增消费记录 public int insert(DetailY detailY) throws Exception { - + User sUser = userMapper.select(detailY.getJwcode()); + if(ObjectUtils.isEmpty(sUser)){ + throw new Exception("无此精网号"); + } // 生成UUID作为订单编号 String uuid = UUID.randomUUID().toString().replace("-", ""); // 去掉UUID中的'-' detailY.setOrderCode(uuid); diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java index 25c6ac9..3cd9941 100644 --- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java @@ -48,7 +48,7 @@ public class DetailYServiceImpl implements DetailYService { } - @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()") +// @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()") @Override public PageInfo getDetailByPage(int pageNum, int pageSize, DetailY detailY) { if(detailY.getNum()!=null) { diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index fb0c324..d29761e 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -144,9 +144,11 @@ public class RechargeServiceImpl implements RechargeService { public List search(RechargeVo rechargeVo) { return rechargeMapper.select(rechargeVo); } - @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rechargeVo.hashCode() ") +// @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rechargeVo.hashCode() ") @Override public PageInfo searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) { + System.out.println(rechargeVo.getSortOrder()); + System.out.println(rechargeVo.getSortField()); PageHelper.startPage(pageNum, pageSize); List list= rechargeMapper.select(rechargeVo); return new PageInfo<>(list); From 185038f925189ff3b421f9044df411da7898528f Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 14 May 2025 17:49:25 +0800 Subject: [PATCH 11/20] =?UTF-8?q?5=E6=9C=8814=E6=97=A5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B6=88=E8=B4=B9=E7=BD=91=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/controller/RefundController.java | 9 +++++++-- .../com/example/demo/serviceImpl/RechargeServiceImpl.java | 7 +++++++ .../com/example/demo/serviceImpl/RefundServiceImpl.java | 14 ++++++++++++-- src/main/java/com/example/demo/sevice/RefundService.java | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/demo/controller/RefundController.java b/src/main/java/com/example/demo/controller/RefundController.java index ba9fc55..5fb0e80 100644 --- a/src/main/java/com/example/demo/controller/RefundController.java +++ b/src/main/java/com/example/demo/controller/RefundController.java @@ -31,8 +31,13 @@ public class RefundController { if (refundService.existsByContactId(detail.getContactId())) { return Result.error("该订单已退款: " + detail.getContactId()); } - - refundService.add(detail); + try { + refundService.add(detail); + } + catch (Exception e) { + log.error(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } refundService.addAudit(detail); refundService.update(detail.getContactId()); diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index d29761e..06eb968 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -3,6 +3,7 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Audit; import com.example.demo.domain.entity.Detail; import com.example.demo.domain.entity.Recharge; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.RechargeA; import com.example.demo.domain.vo.RechargeVo; import com.example.demo.domain.vo.Result; @@ -20,6 +21,7 @@ import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.math.BigDecimal; import java.util.Arrays; @@ -44,6 +46,11 @@ public class RechargeServiceImpl implements RechargeService { @CacheEvict(value = "recharge",allEntries = true) public int add(Recharge recharge) throws Exception { + + User sUser = userMapper.select(recharge.getJwcode()); + if(ObjectUtils.isEmpty(sUser)){ + throw new Exception("无此精网号"); + } // return rechargeMapper.insert(recharge); String uuid = UUID.randomUUID().toString().replace("-", ""); // 去掉UUID中的'-' diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java index 1c4d176..6b9daa2 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java @@ -2,18 +2,22 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Detail; +import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.RefundA; import com.example.demo.mapper.RefundMapper; +import com.example.demo.mapper.UserMapper; import com.example.demo.sevice.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; import java.math.BigDecimal; import java.util.Arrays; @@ -27,10 +31,16 @@ import java.util.UUID; @CacheConfig(cacheNames = "refund") public class RefundServiceImpl implements RefundService { private final RefundMapper refundMapper; - + @Autowired + private UserMapper userMapper; @CacheEvict(value = {"refund", "audit"}, allEntries = true) @Override - public int add(Detail detail) { + public int add(Detail detail) throws Exception { + + User sUser = userMapper.select(detail.getJwcode()); + if(ObjectUtils.isEmpty(sUser)){ + throw new Exception("无此精网号"); + } // 生成UUID作为订单编号 String uuid = UUID.randomUUID().toString().replaceAll("-", ""); // 去掉UUID中的'-' detail.setOrderCode(uuid); diff --git a/src/main/java/com/example/demo/sevice/RefundService.java b/src/main/java/com/example/demo/sevice/RefundService.java index 209bf41..ffbf28f 100644 --- a/src/main/java/com/example/demo/sevice/RefundService.java +++ b/src/main/java/com/example/demo/sevice/RefundService.java @@ -10,7 +10,7 @@ import java.util.List; @Service public interface RefundService { - int add(Detail detail) ; + int add(Detail detail) throws Exception; int addAudit(Detail detail); void edit(Detail newDetail) ; int update(Integer contactId) ; From fb41a0f878d16ee21fd664ade34f9ab9ba0b43a0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 10:39:56 +0800 Subject: [PATCH 12/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AE=9D=E5=A1=94?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/controller/UploadController.java | 1 - src/main/resources/application.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/controller/UploadController.java b/src/main/java/com/example/demo/controller/UploadController.java index 138166d..e6fdede 100644 --- a/src/main/java/com/example/demo/controller/UploadController.java +++ b/src/main/java/com/example/demo/controller/UploadController.java @@ -21,7 +21,6 @@ public class UploadController { @PostMapping public Result upload(MultipartFile file) { - String fileName = UploadUtil.save(file,path); return Result.success(fileName); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fdf5912..9fc1c0b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -77,7 +77,7 @@ mybatis: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl upload: - path: /home/java/haiwaiyanfa/gold1 + path: /home/java/haiwaiyanfa/gold1/ From 218677d5b763d9cc4b3d9a2e37e567c508005041 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 13:27:44 +0800 Subject: [PATCH 13/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/Audit.java | 3 +++ src/main/java/com/example/demo/domain/entity/Detail.java | 3 +++ src/main/java/com/example/demo/domain/vo/RechargeVo.java | 3 +++ src/main/resources/mapper/RechargeMapper.xml | 1 + src/main/resources/mapper/RefundMapper.xml | 3 ++- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/domain/entity/Audit.java b/src/main/java/com/example/demo/domain/entity/Audit.java index 9a64c4a..b4eaf39 100644 --- a/src/main/java/com/example/demo/domain/entity/Audit.java +++ b/src/main/java/com/example/demo/domain/entity/Audit.java @@ -26,6 +26,9 @@ public class Audit implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date auditTime; private Date startDate; private Date endDate; private String reson; diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index 5c35695..79d030f 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -40,6 +40,9 @@ public class Detail implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date auditTime; private String username; private Date endDate; private Date startDate; diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java index 62482e5..787403a 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java +++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java @@ -35,6 +35,9 @@ public class RechargeVo implements Serializable { // 实现 Serializable 接口 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date auditTime; private Date startDate; private Date endDate; private String username; diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index b435090..19ec4af 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -72,6 +72,7 @@ activity.activity_name, audit.`status`, audit.audit_id, + audit.audit_time, audit.reson, admin.name, user.area, diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index f84d14e..3aa0adb 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -63,7 +63,8 @@ au.status, au.reson AS auditReson, au.refund_id, - au.audit_id + au.audit_id, + au.audit_time FROM detail d LEFT JOIN `admin` a ON d.admin_id = a.admin_id LEFT JOIN `user` u ON d.jwcode = u.jwcode From d38b0517a12d774c8e4b642621b8aa76c4b492b0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 13:38:35 +0800 Subject: [PATCH 14/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index d6f9998..eb01943 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -176,11 +176,14 @@ public class AuditServiceImpl implements AuditService { //解决方案:除了查询操作之外,所有的操纵都要执行删除缓存 - @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + T(java.util.Objects).hashCode(#detail)") +// @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + T(java.util.Objects).hashCode(#detail)") @Override public PageInfo searchForConsumeDetail(Integer pageNum, Integer pageSize, Detail detail) { PageHelper.startPage(pageNum,pageSize); List list= refundMapper.select(detail); + System.out.println("1111111111111111111111111111111111111111111111111111111"); + System.out.println(list); + System.out.println("1111111111111111111111111111111111111111111111111111111"); return new PageInfo<>(list); } } From afa3ddf2ffd913e0183b802a25b50db7dbdc2bf4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 14:29:18 +0800 Subject: [PATCH 15/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/mapper/AuditMapper.java | 1 + src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 3 --- .../java/com/example/demo/serviceImpl/RechargeServiceImpl.java | 7 ++++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/mapper/AuditMapper.java b/src/main/java/com/example/demo/mapper/AuditMapper.java index 2518a8b..38077e0 100644 --- a/src/main/java/com/example/demo/mapper/AuditMapper.java +++ b/src/main/java/com/example/demo/mapper/AuditMapper.java @@ -29,6 +29,7 @@ public interface AuditMapper { "recharge_id=#{rechargeId},", "status=#{status},", "`reson`=#{reson}", + "`audit_time`=#{auditTime}", "", "where audit_id=#{auditId}", "" diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index eb01943..315b885 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -181,9 +181,6 @@ public class AuditServiceImpl implements AuditService { public PageInfo searchForConsumeDetail(Integer pageNum, Integer pageSize, Detail detail) { PageHelper.startPage(pageNum,pageSize); List list= refundMapper.select(detail); - System.out.println("1111111111111111111111111111111111111111111111111111111"); - System.out.println(list); - System.out.println("1111111111111111111111111111111111111111111111111111111"); return new PageInfo<>(list); } } diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index 06eb968..bb67422 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -46,10 +46,15 @@ public class RechargeServiceImpl implements RechargeService { @CacheEvict(value = "recharge",allEntries = true) public int add(Recharge recharge) throws Exception { - User sUser = userMapper.select(recharge.getJwcode()); if(ObjectUtils.isEmpty(sUser)){ throw new Exception("无此精网号"); + } else if (recharge.getJwcode()==null||recharge.getJwcode().equals("")) { + throw new Exception("精网号不能为空"); + } else if (recharge.getActivityId()==null||recharge.getActivityId()<=0) { + throw new Exception("活动ID错误或为空"); + } else if (recharge.getPayWay()==null||recharge.getPayWay().equals("")) { + throw new Exception("支付方式不能为空"); } // return rechargeMapper.insert(recharge); From bee922a633ac114613475b14d569740151ed6a4e Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 14:40:50 +0800 Subject: [PATCH 16/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 315b885..47f29ed 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -53,6 +53,7 @@ public class AuditServiceImpl implements AuditService { @Override @Transactional public int goldedit(Audit audit) throws Exception { + audit.setAuditTime(new Date()); int result = auditMapper.update(audit); if (result != 1) { throw new Exception("Failed to insert recharge data"); From 887a6ead2d8b40635a3d08723010e7d33be36a4d Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 15:11:37 +0800 Subject: [PATCH 17/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/DetailY.java | 3 +++ src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java index e87138b..200a292 100644 --- a/src/main/java/com/example/demo/domain/entity/DetailY.java +++ b/src/main/java/com/example/demo/domain/entity/DetailY.java @@ -86,5 +86,8 @@ public class DetailY implements Serializable { private String uid; private BigDecimal gold_last; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date auditTime; } diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 47f29ed..dcef5cf 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -138,6 +138,7 @@ public class AuditServiceImpl implements AuditService { detailY.setFlag(flag); detailY.setCreateTime(createTime); detailY.setConsumePlatform("金币系统"); + detailY.setAuditTime(audit.getAuditTime()); From 19f0897a23ee65fc4a604348f6c50d7be4077284 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 16:33:58 +0800 Subject: [PATCH 18/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index a4dadf8..33acdd5 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -42,6 +42,10 @@ public class ConsumeServiceImpl implements ConsumeService { User sUser = userMapper.select(detailY.getJwcode()); if(ObjectUtils.isEmpty(sUser)){ throw new Exception("无此精网号"); + } else if (detailY.getJwcode()==null||detailY.getJwcode().equals("")) { + throw new Exception("精网号不能为空"); + } else if (detailY.getAllGold()==null||detailY.getAllGold().compareTo(BigDecimal.ZERO) < 0) { + throw new Exception("消费金币总数不能为空或小于等于0"); } // 生成UUID作为订单编号 String uuid = UUID.randomUUID().toString().replace("-", ""); // 去掉UUID中的'-' From d491f597d46a090431cd7cd52c7ba85291221fc3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 May 2025 16:57:39 +0800 Subject: [PATCH 19/20] =?UTF-8?q?5=E6=9C=8816=E6=97=A5=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java | 4 +++- src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java | 4 ++-- .../java/com/example/demo/serviceImpl/RechargeServiceImpl.java | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index dcef5cf..e181dc8 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -46,6 +46,7 @@ public class AuditServiceImpl implements AuditService { @CacheEvict(value = {"audit", "recharge","refund"}, allEntries = true) @Override public int edit(Audit audit) { + audit.setAuditTime(new Date()); return auditMapper.update(audit); } @@ -177,8 +178,9 @@ public class AuditServiceImpl implements AuditService { //问题:每次更新完数据后,redis依然是老数据,无法实时更新 //解决方案:除了查询操作之外,所有的操纵都要执行删除缓存 + //孙加倍cache修改1 -// @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + T(java.util.Objects).hashCode(#detail)") + @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + T(java.util.Objects).hashCode(#detail)") @Override public PageInfo searchForConsumeDetail(Integer pageNum, Integer pageSize, Detail detail) { PageHelper.startPage(pageNum,pageSize); diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java index 3cd9941..a3cec4b 100644 --- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java @@ -47,8 +47,8 @@ public class DetailYServiceImpl implements DetailYService { return new PageInfo<>(list); } - -// @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()") + //孙加倍cache修改2 + @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + #detailY.hashCode()") @Override public PageInfo getDetailByPage(int pageNum, int pageSize, DetailY detailY) { if(detailY.getNum()!=null) { diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index bb67422..6e8559c 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -70,10 +70,10 @@ public class RechargeServiceImpl implements RechargeService { BigDecimal RechargeGold = recharge.getRechargeGold(); BigDecimal PaidGold = recharge.getPaidGold(); BigDecimal FreeGold = recharge.getFreeGold(); - + //不需要免费校验，不太想删除改为-2 if (RechargeGold.compareTo(BigDecimal.ZERO) < 0 || RechargeGold.compareTo(new BigDecimal("999999")) > 0 || PaidGold.compareTo(BigDecimal.ZERO) < 0 || PaidGold.compareTo(new BigDecimal("999999")) > 0 || - FreeGold.compareTo(BigDecimal.ZERO) < 0 || FreeGold.compareTo(new BigDecimal("999999")) > 0) { + FreeGold.compareTo(BigDecimal.ZERO) < 0 || FreeGold.compareTo(new BigDecimal("999999")) > -2) { throw new Exception("充值金额有误，金额必须在0到999999之间！"); } @@ -156,7 +156,8 @@ public class RechargeServiceImpl implements RechargeService { public List search(RechargeVo rechargeVo) { return rechargeMapper.select(rechargeVo); } -// @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rechargeVo.hashCode() ") + //孙加倍cache修改3 + @Cacheable(key="#root.method.name + ':'+ #pageNum + '-' + #pageSize + '-' + #rechargeVo.hashCode() ") @Override public PageInfo searchForPage(Integer pageNum, Integer pageSize, RechargeVo rechargeVo) { System.out.println(rechargeVo.getSortOrder()); From 96b62db92007a0cce7670e0ef7a039405fc15575 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 17 May 2025 10:10:30 +0800 Subject: [PATCH 20/20] =?UTF-8?q?5=E6=9C=8817=E6=97=A5bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/serviceImpl/AuditServiceImpl.java | 43 +++++++++++----------- .../demo/serviceImpl/RechargeServiceImpl.java | 4 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index e181dc8..3cda79d 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -13,6 +13,7 @@ import com.example.demo.sevice.AuditService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -121,27 +122,27 @@ public class AuditServiceImpl implements AuditService { Date createTime = audit.getCreateTime(); DetailY detailY = new DetailY(); - detailY.setJwcode(JwCode); - detailY.setActivityId(activityId); - detailY.setRechargeCoin(paidGold); - detailY.setRechargeWay(Way); - detailY.setFreeCoin(freeGold); - detailY.setRemark(remark); - detailY.setUpdateType(0); - detailY.setAdminId(adminId); - detailY.setActivityName(activityName); - detailY.setArea(area); - detailY.setName(name); - detailY.setUsername(username); - detailY.setOrderCode(uuid); - detailY.setStatus(status1); - detailY.setReson(reson); - detailY.setFlag(flag); - detailY.setCreateTime(createTime); - detailY.setConsumePlatform("金币系统"); - detailY.setAuditTime(audit.getAuditTime()); - - +// detailY.setJwcode(JwCode); +// detailY.setActivityId(activityId); +// detailY.setRechargeCoin(paidGold); +// detailY.setRechargeWay(Way); +// detailY.setFreeCoin(freeGold); +// detailY.setRemark(remark); +// detailY.setUpdateType(0); +// detailY.setAdminId(adminId); +// detailY.setActivityName(activityName); +// detailY.setArea(area); +// detailY.setName(name); +// detailY.setUsername(username); +// detailY.setOrderCode(uuid); +// detailY.setStatus(status1); +// detailY.setReson(reson); +// detailY.setFlag(flag); +// detailY.setCreateTime(createTime); +// detailY.setConsumePlatform("金币系统"); +// detailY.setAuditTime(audit.getAuditTime()); + +// BeanUtils.copyProperties(audit,detailY); System.out.println(uuid+"/*/*/*-/-*/-/*-/-*/-/*-/*-/-*"); detailY.setOrderCode(uuid); diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index 6e8559c..ac2937e 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -70,10 +70,8 @@ public class RechargeServiceImpl implements RechargeService { BigDecimal RechargeGold = recharge.getRechargeGold(); BigDecimal PaidGold = recharge.getPaidGold(); BigDecimal FreeGold = recharge.getFreeGold(); - //不需要免费校验，不太想删除改为-2 if (RechargeGold.compareTo(BigDecimal.ZERO) < 0 || RechargeGold.compareTo(new BigDecimal("999999")) > 0 || - PaidGold.compareTo(BigDecimal.ZERO) < 0 || PaidGold.compareTo(new BigDecimal("999999")) > 0 || - FreeGold.compareTo(BigDecimal.ZERO) < 0 || FreeGold.compareTo(new BigDecimal("999999")) > -2) { + PaidGold.compareTo(BigDecimal.ZERO) < 0 || PaidGold.compareTo(new BigDecimal("999999")) > 0 ) { throw new Exception("充值金额有误，金额必须在0到999999之间！"); }