Merge remote-tracking branch 'origin/sjb' into sjb

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

@@ -24,11 +24,9 @@ public class Activity implements Serializable {
     private String dept;
 
     @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "Asia/Shanghai")
-
     private Date startTime;
 
     @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "Asia/Shanghai")
-
     private Date endTime;
 
     private String activityName;
@@ -43,10 +41,12 @@ public class Activity implements Serializable {
     private String name;
     private Integer status;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
-
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
 

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

@@ -29,7 +29,11 @@ public class Audit  implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
     private String reson;
     private Integer detailId;

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

@@ -44,7 +44,11 @@ public class Detail implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date auditTime;
     private String username;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
     private String uname;
     private Integer firstRecharge;

src/main/java/com/example/demo/domain/entity/Index.java

@@ -1,8 +1,10 @@
 package com.example.demo.domain.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,6 +21,8 @@ public class Index implements Serializable {
     private String remark;
     private Integer type;
     private Integer productFlag;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String token;
 }

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

@@ -35,7 +35,11 @@ public class Recharge implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
     private String orderCode;
     private String token;

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

@@ -22,6 +22,8 @@ public class User implements Serializable {
     private String email;
     private String gender;
     private String area;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
     private String head;
     private Integer UserFlag;
@@ -34,6 +36,8 @@ public class User implements Serializable {
     private BigDecimal coreJb;
     private BigDecimal free6;
     private BigDecimal free12;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date lastTime;
     private String token;
 

src/main/java/com/example/demo/domain/entity/UserGold.java

@@ -18,6 +18,8 @@ public class UserGold implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private String jwcode;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     private String signature;
     private BigDecimal sumgold;
@@ -25,7 +27,11 @@ public class UserGold implements Serializable {
     private BigDecimal coreJb;
     private BigDecimal free6;
     private BigDecimal free12;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date addTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date lastTime;
     private String token;
 }

src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@@ -56,11 +56,18 @@ public class AuditServiceImpl implements AuditService {
     @Transactional
     public int goldedit(Audit audit) throws Exception {
         audit.setAuditTime(new Date());
+        System.out.println("11111111111111111111111111111111111111111111111");
+        System.out.println(audit);
+        System.out.println("11111111111111111111111111111111111111111111111");
         int result = auditMapper.update(audit);
         if (result != 1) {
-            throw new Exception("Failed to insert recharge data");
+            throw new Exception("审核失败");
         }
+
         Integer status = audit.getStatus();
+        System.out.println("11111111111111111111111111111111111111111111111");
+        System.out.println(status);
+        System.out.println("11111111111111111111111111111111111111111111111");
         if(status == 1){
             String jwcode=audit.getJwcode();
             System.out.println(jwcode);
@@ -122,25 +129,25 @@ public class AuditServiceImpl implements AuditService {
             Date createTime = audit.getCreateTime();
 
             DetailY detailY = new DetailY();
-//             detailY.setJwcode(JwCode);
-//        detailY.setActivityId(activityId);
-//            detailY.setRechargeCoin(paidGold);
-//            detailY.setRechargeWay(Way);
-//            detailY.setFreeCoin(freeGold);
-//            detailY.setRemark(remark);
-//            detailY.setUpdateType(0);
-//            detailY.setAdminId(adminId);
-//            detailY.setActivityName(activityName);
-//            detailY.setArea(area);
-//            detailY.setName(name);
-//            detailY.setUsername(username);
-//            detailY.setOrderCode(uuid);
-//            detailY.setStatus(status1);
-//            detailY.setReson(reson);
-//            detailY.setFlag(flag);
-//            detailY.setCreateTime(createTime);
-//            detailY.setConsumePlatform("金币系统");
-//            detailY.setAuditTime(audit.getAuditTime());
+            detailY.setJwcode(JwCode);
+            detailY.setActivityId(activityId);
+            detailY.setRechargeCoin(paidGold);
+            detailY.setRechargeWay(Way);
+            detailY.setFreeCoin(freeGold);
+            detailY.setRemark(remark);
+            detailY.setUpdateType(0);
+            detailY.setAdminId(adminId);
+            detailY.setActivityName(activityName);
+            detailY.setArea(area);
+            detailY.setName(name);
+            detailY.setUsername(username);
+            detailY.setOrderCode(uuid);
+            detailY.setStatus(status1);
+            detailY.setReson(reson);
+            detailY.setFlag(flag);
+            detailY.setCreateTime(createTime);
+            detailY.setConsumePlatform("金币系统");
+            detailY.setAuditTime(audit.getAuditTime());
 
 //            BeanUtils.copyProperties(audit,detailY);