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/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index 87c5582..fa6616e 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java @@ -29,17 +29,19 @@ public class ConsumeUser implements Serializable { private static final long serialVersionUID = 1L; - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 + @ExcelProperty("订单号") + private String orderCode; // 订单号 @ExcelProperty("精网号") private Integer jwcode; // 精网号 @ExcelProperty("所属地区") private String market; // 所属地区 @ExcelProperty("商品名称") private String goodsName; // 商品名称 - @ExcelProperty("充值方式") + @ExcelProperty("消耗平台") private String payPlatform; // 消费平台 - @ExcelProperty("金币总数") + @ExcelProperty("消耗金币总数") private BigDecimal sumGold; // 金币总数 @ExcelProperty("永久金币") private BigDecimal permanentGold; // 永久金币 @@ -49,13 +51,14 @@ public class ConsumeUser implements Serializable { private BigDecimal taskGold; // 任务金币 @ExcelProperty("备注") private String remark; // 备注 - @ExcelProperty("提交人ID") + @ExcelIgnore +// @ExcelProperty("提交人ID") private Integer adminId; //提交人Id - @ExcelProperty("提交人姓名") + @ExcelProperty("提交人") private String adminName; //提交人姓名 @ExcelProperty("是否退款") private Integer isRefund; //是否退款 - @ExcelProperty("消费时间") + @ExcelProperty("消耗时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 消费时间 @ExcelIgnore 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/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java index 9d8059f..9bb01fc 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java @@ -26,9 +26,10 @@ public class RechargeUser { private static final long serialVersionUID = 1L; - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 - + @ExcelProperty("订单号") + private String orderCode; // 订单号 @ExcelProperty("精网号") private Integer jwcode; // 精网号 @@ -56,7 +57,7 @@ public class RechargeUser { @ExcelProperty("支付方式") private String payModel; // 支付方式 - @ExcelProperty("充值方式") + @ExcelProperty("充值平台") private String payPlatform; // 充值方式 @ExcelProperty("支付凭证") @@ -64,18 +65,17 @@ public class RechargeUser { @ExcelProperty("备注") private String remark; // 备注 - - @ExcelProperty("提交人Id") + @ExcelIgnore private Integer adminId; // 提交人Id - @ExcelProperty("提交人姓名") + @ExcelProperty("提交人") private String adminName; // 提交人姓名 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - @ExcelProperty("创建时间") + @ExcelProperty("付款时间") private Date payTime; // 创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - @ExcelProperty("审核时间") + @ExcelProperty("充值时间") private Date auditTime; // 审核时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @ExcelIgnore diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java index d7e51c1..606d990 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java @@ -29,7 +29,7 @@ public class RefundUser { @ExcelProperty("订单号") private String orderCode; // 订单号 - @ExcelProperty("客户姓名") + @ExcelProperty("姓名") private String name; // 客户姓名 @ExcelProperty("精网号") private Integer jwcode; // 精网号 @@ -41,7 +41,7 @@ public class RefundUser { private String refundType; // 退款类型 @ExcelProperty("退款方式") private Byte refundModel; // 退款方式(0全部/1部分退款) - @ExcelProperty("金币总数") + @ExcelProperty("退款金币总数") private BigDecimal sumGold; // 金币总数 @ExcelProperty("永久金币") private BigDecimal permanentGold; // 永久金币 @@ -51,15 +51,16 @@ public class RefundUser { private BigDecimal taskGold; // 任务金币 @ExcelProperty("退款原因") private String remark; // 退款原因 - @ExcelProperty("提交人ID") +// @ExcelProperty("提交人ID") + @ExcelIgnore private Integer adminId; //提交人Id - @ExcelProperty("提交人姓名") + @ExcelProperty("提交人") private String adminName; //提交人姓名 - @ExcelProperty("创建时间") + @ExcelProperty("提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 创建时间 - @ExcelProperty("审核时间") + @ExcelProperty("退款时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date auditTime; // 审核时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 68a913b..905243a 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -76,6 +76,7 @@