diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 5459a82..efa3e07 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -79,7 +79,7 @@ public class MysqlServiceImpl implements MysqlService { String querySql = """ SELECT gtype, jwcode, free, core_jb, buy_jb, cz_time, cz_user, cz_bz, operation_platform, goods_name FROM hwhcGold.dbo.user_gold_records - WHERE flag = 1 AND cz_time > ? + WHERE flag = 1 AND cz_time > '2025-08-24 17:57:50' ORDER BY cz_time ASC OFFSET ? ROWS FETCH NEXT ? ROWS ONLY """; @@ -92,9 +92,9 @@ public class MysqlServiceImpl implements MysqlService { while (hasMoreData) { try (PreparedStatement sqlServerStmt = sqlServerConn.prepareStatement(querySql)) { - sqlServerStmt.setTimestamp(1, Timestamp.valueOf(LocalDateTime.now().minusHours(1))); // 获取最近一小时的数据 - sqlServerStmt.setInt(2, offset); // 设置 OFFSET - sqlServerStmt.setInt(3, pageSize); // 设置 FETCH NEXT +// sqlServerStmt.setTimestamp(1, Timestamp.valueOf(LocalDateTime.now().minusHours(1))); // 获取最近一小时的数据 + sqlServerStmt.setInt(1, offset); // 设置 OFFSET + sqlServerStmt.setInt(2, pageSize); // 设置 FETCH NEXT ResultSet resultSet = sqlServerStmt.executeQuery(); @@ -121,7 +121,8 @@ public class MysqlServiceImpl implements MysqlService { String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); String orderNumber = UUID.randomUUID().toString().replaceAll("-", ""); - if (StringUtils.isNumeric(name)) { + if (StringUtils.isNumeric(name)) {; + System.out.println("name是数字"+ name); Integer admin_id = Integer.valueOf(adminService.getId(name)); mysqlStmt.setInt(14, admin_id); } else { diff --git a/src/main/java/com/example/demo/controller/coin/GeneralController.java b/src/main/java/com/example/demo/controller/coin/GeneralController.java index adcfe3d..c173ec4 100644 --- a/src/main/java/com/example/demo/controller/coin/GeneralController.java +++ b/src/main/java/com/example/demo/controller/coin/GeneralController.java @@ -81,4 +81,9 @@ public class GeneralController { List list = generalService.getActivity(); return Result.success(list); } + @PostMapping("/getRate") + public Result getRate() + { + return Result.success(generalService.getRate()); + } } diff --git a/src/main/java/com/example/demo/domain/entity/User.java b/src/main/java/com/example/demo/domain/entity/User.java index f5ee35d..1d7f71f 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -38,9 +38,9 @@ public class User implements Serializable { private BigDecimal sumGold;// 金币总数 @ExcelProperty("当前永久金币") private BigDecimal currentPermanentGold; // 当前永久金币 - @ExcelProperty("当前到期六月免费金币") + @ExcelProperty("当前六月到期免费金币") private BigDecimal currentFreeJune; // 当前六月免费金币 - @ExcelProperty("当前到期十二月免费金币") + @ExcelProperty("当前十二月到期免费金币") private BigDecimal currentFreeDecember; // 当前十二月免费金币 @ExcelProperty("当前任务金币") private BigDecimal currentTaskGold; // 当前任务金币 diff --git a/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java index a22844f..dc74ed6 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java +++ b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java @@ -40,9 +40,11 @@ public class GoldDetail { private BigDecimal sumGold; // 总金币 @ExcelProperty("永久金币") private BigDecimal permanentGold; //永久金币 - @ExcelProperty("免费金币六月到期") + @ExcelProperty("免费金币") + private BigDecimal freeGold; + @ExcelIgnore private BigDecimal freeJune; // 免费金币六月到期 - @ExcelProperty("免费金币十二月到期") + @ExcelIgnore private BigDecimal freeDecember; // 免费金币十二月到期 @ExcelProperty("任务金币") private BigDecimal taskGold; // 任务金币 diff --git a/src/main/java/com/example/demo/mapper/coin/GeneralMapper.java b/src/main/java/com/example/demo/mapper/coin/GeneralMapper.java index 0601f1b..67b1d09 100644 --- a/src/main/java/com/example/demo/mapper/coin/GeneralMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/GeneralMapper.java @@ -28,4 +28,6 @@ public interface GeneralMapper { String getRoleMarket(Integer roleId); List getAllRoleMarket(); + + List getRate(); } diff --git a/src/main/java/com/example/demo/service/coin/GeneralService.java b/src/main/java/com/example/demo/service/coin/GeneralService.java index 23d7a01..b38da64 100644 --- a/src/main/java/com/example/demo/service/coin/GeneralService.java +++ b/src/main/java/com/example/demo/service/coin/GeneralService.java @@ -39,4 +39,6 @@ public interface GeneralService { List getRoleMarket(Integer roleId); //获取所有市场（地区） List getAllRoleMarket(); + //获取汇率 + List getRate(); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java index fc4b374..900a9e9 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java @@ -198,4 +198,10 @@ public class GeneralServiceImpl implements GeneralService { List list = generalMapper.getAllRoleMarket(); return list; } + + @Override + public List getRate() { + List list = generalMapper.getRate(); + return list; + } } diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml index 06cdbfc..dc4fd6f 100644 --- a/src/main/resources/mapper/GeneralMapper.xml +++ b/src/main/resources/mapper/GeneralMapper.xml @@ -29,4 +29,7 @@ + \ No newline at end of file diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index 1fa24c5..fc08276 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -28,6 +28,7 @@ m.name AS market, `ugr`.pay_platform, `ugr`.type, + Round((`ugr`.free_june + `ugr`.free_december) / 100.0, 2) AS freeGold, ROUND(`ugr`.sum_gold / 100.0, 2) AS SumGold, ROUND(`ugr`.permanent_gold / 100.0, 2) AS PermanentGold, ROUND(`ugr`.free_june / 100.0, 2) AS freeJune,