diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/AdminController.java index 21294f0..cae0ff5 100644 --- a/src/main/java/com/example/demo/controller/AdminController.java +++ b/src/main/java/com/example/demo/controller/AdminController.java @@ -45,16 +45,10 @@ public class AdminController { } } @PostMapping("/userinfo") - public UserDetails getUserInfo(@RequestBody String requestBody) { - ObjectMapper objectMapper = new ObjectMapper(); - TokenPayload token1; - try { - token1 = objectMapper.readValue(requestBody, TokenPayload.class); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - String token = token1.getToken(); + public UserDetails getUserInfo(@RequestHeader("token") String token1) { + //String token = token1.getToken(); + String token = token1; System.out.println("1/*/*/*/*//*-*-*-*-*-*-1" +token); try { System.out.println("/+/+/+/+/+/+/+//" + JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class)); diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index 9ddf11b..0914acb 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -45,7 +45,7 @@ public class ConsumeController { return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize(),page.getConsumeUser())); } } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查筛选数据的格式"); } @@ -65,7 +65,7 @@ public class ConsumeController { return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsumeUser())); } } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查筛选数据的格式"); } } @@ -77,7 +77,7 @@ public class ConsumeController { Gold gold = consumeService.statsGold(consumeUser); return Result.success(gold); } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查数据的格式"); } } @@ -94,7 +94,7 @@ public class ConsumeController { // } // } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查数据的格式"); } } diff --git a/src/main/java/com/example/demo/controller/ExportController.java b/src/main/java/com/example/demo/controller/ExportController.java index 2269657..b773b02 100644 --- a/src/main/java/com/example/demo/controller/ExportController.java +++ b/src/main/java/com/example/demo/controller/ExportController.java @@ -42,8 +42,13 @@ public class ExportController { @Autowired private ExportService exportService; @PostMapping("/export") - public Result export(@RequestBody Export Export){ - return Result.success(exportExcelService.getExcel(Export)); + public Result export(@RequestBody Export Export)throws Exception{ + try { + return Result.success(exportExcelService.getExcel(Export)); + } catch (Exception e) { + log.error("导出失败", e.getMessage()); + return Result.error("导出失败"+e.getMessage()); + } } @PostMapping("/exportRecharge") public Result export(@Valid @RequestBody RechargeDTO dto) { diff --git a/src/main/java/com/example/demo/controller/RechargeController.java b/src/main/java/com/example/demo/controller/RechargeController.java index 005e08a..ecd0880 100644 --- a/src/main/java/com/example/demo/controller/RechargeController.java +++ b/src/main/java/com/example/demo/controller/RechargeController.java @@ -42,7 +42,7 @@ public class RechargeController { return Result.success(rechargeService.selectAll(page.getPageNum(), page.getPageSize(),page.getRechargeUser())); } } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查筛选数据的格式"); } @@ -62,7 +62,7 @@ public class RechargeController { return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser())); } } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查筛选数据的格式"); } } @@ -74,7 +74,7 @@ public class RechargeController { Gold gold = rechargeService.statsGold(rechargeUser); return Result.success(gold); } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查数据的格式"); } } @@ -84,7 +84,7 @@ public class RechargeController { try { return rechargeService.add(rechargeUser); } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查数据的格式"); } } diff --git a/src/main/java/com/example/demo/controller/RefundController.java b/src/main/java/com/example/demo/controller/RefundController.java index edd707b..78b3446 100644 --- a/src/main/java/com/example/demo/controller/RefundController.java +++ b/src/main/java/com/example/demo/controller/RefundController.java @@ -43,7 +43,7 @@ public class RefundController { return Result.success(refundService.selectAll(page.getPageNum(), page.getPageSize(), page.getRefundUser())); } } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查筛选数据的格式"); } } @@ -57,10 +57,11 @@ public class RefundController { if (ObjectUtils.isEmpty(page.getPageSize())) { return Result.error("页大小为空！"); } else { + return Result.success(refundService.selectBy(page.getPageNum(), page.getPageSize(), page.getRefundUser())); } } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查筛选数据的格式"); } } @@ -71,7 +72,7 @@ public class RefundController { Gold gold = refundService.statsGold(refundUser); return Result.success(gold); } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查数据的格式"); } } @@ -95,7 +96,7 @@ public class RefundController { try { return refundService.add(refundUser); } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查数据的格式"); } } } diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java index 09d3ccf..3f12756 100644 --- a/src/main/java/com/example/demo/controller/UserController.java +++ b/src/main/java/com/example/demo/controller/UserController.java @@ -35,7 +35,7 @@ public class UserController { user = userService.selectUser(user.getJwcode().toString()); return Result.success(user); } catch (Exception e) { - return Result.error("接口调用失败"); + return Result.error("请检查输入精网号"); } } } diff --git a/src/main/java/com/example/demo/domain/vo/GoldDetail.java b/src/main/java/com/example/demo/domain/vo/GoldDetail.java index afe6f2e..7ed07e8 100644 --- a/src/main/java/com/example/demo/domain/vo/GoldDetail.java +++ b/src/main/java/com/example/demo/domain/vo/GoldDetail.java @@ -38,5 +38,7 @@ public class GoldDetail { private Date endTime; // 结束时间 private String sortField; //排序字段 private String sortOrder; //排序顺序 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date auditTime; } diff --git a/src/main/java/com/example/demo/security/SecurityConfig.java b/src/main/java/com/example/demo/security/SecurityConfig.java index 4843f2a..5f0068f 100644 --- a/src/main/java/com/example/demo/security/SecurityConfig.java +++ b/src/main/java/com/example/demo/security/SecurityConfig.java @@ -60,7 +60,7 @@ public class SecurityConfig { request .requestMatchers( HttpMethod.POST, // 用户不登录就可以访问的路径 - "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**","/**").permitAll() + "/admin/login","/upload/**","/detailY/ERP","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**").permitAll() .requestMatchers( "/error","alipay/**","/upload/**","/home/java/haiwaiyanfa/gold1/**","/home/java/haiwaiyanfa/**" ).permitAll() diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 7faf332..32a34ac 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -96,6 +96,12 @@ public class ConsumeServiceImpl implements ConsumeService { //新增消耗 @Override public Result add(ConsumeUser consumeUser) { + if(consumeUser.getTaskGold()==null||consumeUser.getFreeGold()==null||consumeUser.getPermanentGold()==null){ + return Result.error("金币数量不能为空"); + } + if(consumeUser.getTaskGold()<0||consumeUser.getFreeGold()<0||consumeUser.getPermanentGold()<0){ + return Result.error("金币不能为负数"); + } UserGoldRecord userGoldRecord = new UserGoldRecord(); // 获取当前时间戳部分 @@ -160,10 +166,11 @@ public class ConsumeServiceImpl implements ConsumeService { user.setConsumeNum(gold.getConsumeNum() + 1); user.setSumConsume(consumeUser.getPermanentGold() + consumeUser.getFreeGold() + consumeUser.getTaskGold()); userMapper.updateGold(user); - //对接接口 -// GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, -// (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) /100, -// userGoldRecord.getRemark(),((double) userGoldRecord.getPermanentGold() /100), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName()); + if(consumeUser.getJwcode().equals(94226013)){ + GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, + (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) /100, + userGoldRecord.getRemark(),((double) userGoldRecord.getPermanentGold() /100), userGoldRecord.getPayPlatform(), userGoldRecord.getGoodsName()); + } return Result.success(); } } diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index c3cce46..74166b0 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -8,10 +8,8 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * @program: GOLD @@ -42,13 +40,22 @@ public class GeneralServiceImpl implements GeneralService { @Override public List getGoods() { List list = generalMapper.getGoods(); - return list; + // 使用 Java 8 的 Stream API 过滤 null 和空字符串 + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; } @Override public List getActivity() { List list = generalMapper.getActivity(); - return list; + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; } diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java index bf93fd2..81b344c 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java @@ -83,6 +83,12 @@ public class RechargeServiceImpl implements RechargeService { @Override public Result add(RechargeUser rechargeUser) { + if(rechargeUser.getFreeGold()==null||rechargeUser.getPermanentGold()==null||rechargeUser.getMoney()==null){ + return Result.error("金币和金额不能为空"); + } + if(rechargeUser.getFreeGold()<0||rechargeUser.getPermanentGold()<=0||rechargeUser.getMoney()<=0){ + return Result.error("充值不能为负数或0"); + } UserGoldRecord userGoldRecord = new UserGoldRecord(); // 获取当前时间戳部分 diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java index b46e73b..ffe7dac 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java @@ -21,7 +21,9 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; /** * @program: gold-java @@ -91,6 +93,12 @@ public class RefundServiceImpl implements RefundService { @Transactional @Override public Result add(RefundUser refundUser) { + if(refundUser.getTaskGold()==null||refundUser.getFreeGold()==null||refundUser.getPermanentGold()==null){ + return Result.error("金币不能为空"); + } + if(refundUser.getTaskGold()<0||refundUser.getFreeGold()<0||refundUser.getPermanentGold()<0){ + return Result.error("金币不能为负数"); + } UserGoldRecord userGoldRecord = new UserGoldRecord(); String goodsNameWithOrder = refundUser.getGoodsName(); String orderCode = ""; @@ -141,7 +149,11 @@ public class RefundServiceImpl implements RefundService { @Override public List getRefundType() { List list = refundMapper.getRefundType(); - return list; + List filteredList = list.stream() + .filter(Objects::nonNull) // 过滤掉 null 值 + .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串和仅包含空白字符的字符串 + .collect(Collectors.toList()); + return filteredList; } @Override @@ -160,6 +172,7 @@ public class RefundServiceImpl implements RefundService { String combined = orderCode + "_" + goodsName; RefundUser refundUser = new RefundUser(); refundUser.setGoodsName(combined); + refundUser.setSumGold(record.getPermanentGold()+record.getFreeGold()+record.getTaskGold()); refundUser.setPermanentGold(record.getPermanentGold()); refundUser.setFreeGold(record.getFreeGold()); refundUser.setTaskGold(record.getTaskGold()); diff --git a/src/main/resources/mapper/ExportMapper.xml b/src/main/resources/mapper/ExportMapper.xml index f67834b..c9c85bd 100644 --- a/src/main/resources/mapper/ExportMapper.xml +++ b/src/main/resources/mapper/ExportMapper.xml @@ -22,7 +22,6 @@ and account = #{account} + order by create_time desc - - \ No newline at end of file diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index ecd41fd..fe5b351 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -7,7 +7,8 @@