diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java index e03968d..dee5da7 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Activity.java @@ -1,6 +1,8 @@ package com.example.commons.domain.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.time.LocalDate; @@ -19,7 +21,8 @@ public class Activity { private BigDecimal rechargeRatio; private LocalDateTime createTime; private Integer activityFlag; - + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private String name; private Integer status; private Date startDate; diff --git a/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java b/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java index ade5b3f..ceec4b1 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java +++ b/demo/commons/src/main/java/com/example/commons/domain/entity/Audit.java @@ -22,4 +22,5 @@ public class Audit { private Date createTime; private Date startDate; private Date endDate; + private String reson; } diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java new file mode 100644 index 0000000..50e5996 --- /dev/null +++ b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java @@ -0,0 +1,35 @@ +package com.example.commons.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +@Data +@NoArgsConstructor +public class ConsumeDetail { + private Integer detailId; + private String name; + private String homilyId; + private String area; + private Integer activityId; + private String rechargeWay; + private String goods; + private String consumePlatform; + private String consumeType; + private String refundType; + private String refundGoods; + private Integer contactId; + private String remark; + private Double rechargeCoin; + private Double freeCoin; + private Double taskCoin; + private String conmmitName; + private Integer status; + private String updateType; + private Integer detailFlag; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; +} diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java index 129367a..c2d24ca 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java +++ b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java @@ -30,11 +30,11 @@ public interface RechargeMapper { @Select({ "