Browse Source

后端整合模块

detached
huangqizhen 5 months ago
parent
commit
bf4441b521
  1. 2
      src/main/java/com/example/demo/domain/entity/Activity.java
  2. 1
      src/main/java/com/example/demo/domain/entity/Admin.java
  3. 2
      src/main/java/com/example/demo/domain/entity/Audit.java
  4. 2
      src/main/java/com/example/demo/domain/entity/Detail.java
  5. 8
      src/main/java/com/example/demo/domain/entity/Rate.java
  6. 2
      src/main/java/com/example/demo/domain/entity/Recharge.java
  7. 2
      src/main/java/com/example/demo/domain/entity/User.java
  8. 2
      src/main/java/com/example/demo/domain/vo/ConsumeDetail.java
  9. 2
      src/main/java/com/example/demo/domain/vo/Meium.java

2
src/main/java/com/example/demo/domain/entity/Activity.java

@ -33,7 +33,7 @@ public class Activity implements Serializable {
private String activityName; private String activityName;
private BigDecimal rechargeRatio; private BigDecimal rechargeRatio;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;

1
src/main/java/com/example/demo/domain/entity/Admin.java

@ -23,6 +23,7 @@ public class Admin implements UserDetails, Serializable {
private String area; private String area;
private String adminFlag; private String adminFlag;
private String token; private String token;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;
private String jwcode; private String jwcode;

2
src/main/java/com/example/demo/domain/entity/Audit.java

@ -17,7 +17,7 @@ public class Audit {
private Integer adminId; private Integer adminId;
private Integer status; private Integer status;
private Integer AuditFlag; private Integer AuditFlag;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;
private Date startDate; private Date startDate;

2
src/main/java/com/example/demo/domain/entity/Detail.java

@ -34,7 +34,7 @@ public class Detail implements Serializable {
private Integer status; private Integer status;
private String updateType; private String updateType;
private Integer detailFlag; private Integer detailFlag;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;

8
src/main/java/com/example/demo/domain/entity/Rate.java

@ -11,18 +11,18 @@ import java.util.Date;
@NoArgsConstructor @NoArgsConstructor
public class Rate { public class Rate {
private Integer rateId; private Integer rateId;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime; private Date startTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endTime; private Date endTime;
private String currency; private String currency;
private String exchangeRate; private String exchangeRate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date updateTime; private Date updateTime;
private Integer adminId; private Integer adminId;

2
src/main/java/com/example/demo/domain/entity/Recharge.java

@ -26,7 +26,7 @@ public class Recharge {
private String remark; private String remark;
private Integer flag; private Integer flag;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;
private Date startDate; private Date startDate;

2
src/main/java/com/example/demo/domain/entity/User.java

@ -21,7 +21,7 @@ public class User {
private Date birthday; private Date birthday;
private String head; private String head;
private Integer UserFlag; private Integer UserFlag;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime; private Date createTime;
private String signature; private String signature;

2
src/main/java/com/example/demo/domain/vo/ConsumeDetail.java

@ -10,7 +10,7 @@ import java.util.Date;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
public class ConsumeDetail { public class ConsumeDetail {
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Integer detailId; private Integer detailId;
private String name; private String name;

2
src/main/java/com/example/demo/domain/vo/Meium.java

@ -25,7 +25,7 @@ public class Meium implements Serializable {
private BigDecimal taskSumCoin; private BigDecimal taskSumCoin;
private String area; private String area;
private String store; private String store;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private BigDecimal totalRechargeSum; private BigDecimal totalRechargeSum;
private Date searchStartTime; private Date searchStartTime;

Loading…
Cancel
Save