From 2070c7657ab344caf4226592c08be4271a8c2864 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 21 Aug 2025 10:44:12 +0800 Subject: [PATCH] =?UTF-8?q?8-21=20=E5=85=85=E5=80=BC=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E9=A6=96=E5=85=85=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/User.java | 2 +- src/main/java/com/example/demo/domain/vo/coin/GoldUser.java | 2 +- src/main/java/com/example/demo/mapper/coin/AuditMapper.java | 3 +++ .../java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java | 8 ++++++-- src/main/resources/mapper/AuditMapper.xml | 6 ++++++ 5 files changed, 17 insertions(+), 4 deletions(-) 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 e5dc635..b93bd10 100644 --- a/src/main/java/com/example/demo/domain/entity/User.java +++ b/src/main/java/com/example/demo/domain/entity/User.java @@ -57,7 +57,7 @@ public class User implements Serializable { @ExcelIgnore private List markets; @ExcelProperty("首充日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date firstRecharge; // 首充日期 @ExcelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") diff --git a/src/main/java/com/example/demo/domain/vo/coin/GoldUser.java b/src/main/java/com/example/demo/domain/vo/coin/GoldUser.java index efac8d1..8fa5110 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/GoldUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/GoldUser.java @@ -54,7 +54,7 @@ public class GoldUser { @ExcelProperty("消费次数") private Integer consumeNum; // 消费次数 @ExcelProperty("首充日期") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "Asia/Shanghai") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date firstRecharge; // 首充日期 private List markets; // 地区列表 } diff --git a/src/main/java/com/example/demo/mapper/coin/AuditMapper.java b/src/main/java/com/example/demo/mapper/coin/AuditMapper.java index fc9cf95..8d316c8 100644 --- a/src/main/java/com/example/demo/mapper/coin/AuditMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/AuditMapper.java @@ -7,6 +7,7 @@ import com.example.demo.domain.vo.coin.RefundAudit; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -43,4 +44,6 @@ public interface AuditMapper { //获取审核人id对应的人名 String getName(Integer auditId); + //更新首充日期 + void updateFirstRecharge(Integer jwcode); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index 8865a82..bc113ae 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -20,7 +20,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; /** @@ -103,8 +105,10 @@ public class AuditServiceImpl implements AuditService { 2.用户当前首充时间小于当前时间 3.用户当前首充时间等于2020-01-01 00:00:00 */ - if(oldFirstRecharge== null || oldFirstRecharge.after(date) || "2020-01-01 00:00:00".equals(oldFirstRecharge.toString())){ - update.setFirstRecharge(date);//设置首充时间为当前时间 + // 构造 2020-01-01 00:00:00 + Date placeholder = new GregorianCalendar(2020, Calendar.JANUARY, 1, 0, 0).getTime(); + if(oldFirstRecharge== null||oldFirstRecharge.after(date)||placeholder.equals(oldFirstRecharge)){ + auditMapper.updateFirstRecharge(order.getJwcode());//设置首充时间为当前时间 } auditMapper.updateUserGold(update); //erp增加充值数据 diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index c65d73f..50ebb29 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -25,6 +25,7 @@ current_task_gold = current_task_gold + COALESCE(#{currentTaskGold},0), recharge_num = recharge_num+COALESCE(#{rechargeNum},0) + where jwcode = #{jwcode} @@ -33,6 +34,11 @@ set is_refund = #{isRefund} where order_code = #{orderCode} + + update user + set first_recharge = NOW() + where jwcode = #{jwcode} +