diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index da86316..5459a82 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -119,6 +119,7 @@ public class MysqlServiceImpl implements MysqlService { String operation_platform = resultSet.getString("operation_platform"); String goods_name = resultSet.getString("goods_name"); String timestampPart = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")); + String orderNumber = UUID.randomUUID().toString().replaceAll("-", ""); if (StringUtils.isNumeric(name)) { Integer admin_id = Integer.valueOf(adminService.getId(name)); @@ -139,24 +140,24 @@ public class MysqlServiceImpl implements MysqlService { if (validZeroTypes.contains(gtype)) { mysqlStmt.setInt(13, 0); mysqlStmt.setNull(20, java.sql.Types.INTEGER); - mysqlStmt.setString(1, "ERPCZ_" + timestampPart + randomNumber); + mysqlStmt.setString(1, "ERPCZ_" +orderNumber ); } if (validOneTypes.contains(gtype)) { mysqlStmt.setInt(13, 1); mysqlStmt.setInt(20, 0); - mysqlStmt.setString(1, "ERPXF_" + timestampPart + randomNumber); + mysqlStmt.setString(1, "ERPXF_" + orderNumber); } if (validTwoTypes.contains(gtype)) { mysqlStmt.setInt(13, 2); mysqlStmt.setInt(20, 0); - mysqlStmt.setString(1, "ERPTK_" + timestampPart + randomNumber); + mysqlStmt.setString(1, "ERPTK_" +orderNumber); mysqlStmt.setString(10, "退款商品"); mysqlStmt.setInt(11, 0); } if (validThreeTypes.contains(gtype)) { mysqlStmt.setInt(13, 3); mysqlStmt.setNull(20, java.sql.Types.INTEGER); - mysqlStmt.setString(1, "ERPQT_" + timestampPart + randomNumber); + mysqlStmt.setString(1, "ERPQT_" +orderNumber); } mysqlStmt.setInt(2, jwcode); 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 84df75d..f5ee35d 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -22,7 +22,7 @@ public class User implements Serializable { private Integer id; // 客户id @ExcelProperty("精网号") private Integer jwcode; // 精网号 - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 @ExcelProperty("所属地区") private String market; // 所属地区 @@ -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 35ce6e2..a22844f 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 @@ -26,17 +26,17 @@ public class GoldDetail { @ExcelIgnore private String token; - @ExcelProperty("名称") + @ExcelProperty("姓名") private String name; // 名称 @ExcelProperty("精网号") private Integer jwcode; // 精网号 @ExcelProperty("所属地区") private String market; // 所属地区 - @ExcelProperty("支付平台") + @ExcelProperty("平台信息") private String payPlatform; // 支付平台 - @ExcelProperty("类型") + @ExcelProperty("更新类型") private Integer type; // 类型 - @ExcelProperty("总金币") + @ExcelProperty("金币数量") private BigDecimal sumGold; // 总金币 @ExcelProperty("永久金币") private BigDecimal permanentGold; //永久金币 diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index ae97d94..168c21a 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -42,14 +42,14 @@ u.name AS "name", u.jwcode AS "jwcode", m.name AS "market", - (COALESCE(u.current_permanent_gold, 0) + COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0) + COALESCE(u.current_task_gold, 0)) AS "nowSumGold", - u.current_permanent_gold AS "nowPermanentGold", - (COALESCE(u.current_free_june, 0) + COALESCE(u.current_free_december, 0)) AS "nowFreeGold", - u.current_task_gold AS "nowTaskGold", - (COALESCE(u.sum_permanent_gold, 0) + COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0) + COALESCE(u.sum_task_gold, 0)) AS "historySumGold", - u.sum_permanent_gold AS "historyPermanentGold", - (COALESCE(u.sum_free_june, 0) + COALESCE(u.sum_free_december, 0)) AS "historyFreeGold", - u.sum_task_gold AS "historyTaskGold", + ROUND((IFNULL(u.current_permanent_gold, 0) + IFNULL(u.current_free_june, 0) + IFNULL(u.current_free_december, 0) + IFNULL(u.current_task_gold, 0)) / 100.0, 2) AS nowSumGold, + ROUND(IFNULL(u.current_permanent_gold, 0) / 100.0, 2) AS nowPermanentGold, + ROUND((IFNULL(u.current_free_june, 0) + IFNULL(u.current_free_december, 0)) / 100.0, 2) AS nowFreeGold, + ROUND(IFNULL(u.current_task_gold, 0) / 100.0, 2) AS nowTaskGold, + ROUND((IFNULL(u.sum_permanent_gold, 0) + IFNULL(u.sum_free_june, 0) + IFNULL(u.sum_free_december, 0) + IFNULL(u.sum_task_gold, 0)) / 100.0, 2) AS historySumGold, + ROUND(IFNULL(u.sum_permanent_gold, 0) / 100.0, 2) AS historyPermanentGold, + ROUND((IFNULL(u.sum_free_june, 0) + IFNULL(u.sum_free_december, 0)) / 100.0, 2) AS historyFreeGold, + u.sum_task_gold AS "historyTaskGold", u.recharge_num AS "rechargeNum", u.consume_num AS "consumeNum", u.first_recharge AS "firstRecharge"