后端整合模块

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

@@ -22,18 +22,18 @@ public class Activity implements Serializable {
     private Integer adminId;
     private String dept;
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
+
     private Date startTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
+
     private Date endTime;
 
     private String activityName;
     private BigDecimal rechargeRatio;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", timezone = "UTC")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 

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

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

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

@@ -23,7 +23,7 @@ public class Recharge {
     private String rechargeVoucher;
     private Integer adminId;
     private String area;
-
+    private String rechargeRatio;
     private String remark;
     private Integer flag;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

src/main/java/com/example/demo/mapper/RateMapper.java

@@ -63,6 +63,7 @@ public interface RateMapper {
             "<if test='updateTime != null'>AND r.update_time LIKE CONCAT('%', #{updateTime}, '%')</if>",
             "<if test='adminId != null'>AND r.admin_id = #{adminId}</if>",
             "<if test='updateId != null'>AND r.update_id = #{updateId}</if>",
+            "ORDER BY r.create_time DESC",
             "</script>"
 
     })

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

@@ -40,6 +40,11 @@ public class ConsumeServiceImpl implements ConsumeService {
     @Override
     //新增消费记录
     public int insert(Detail detail) throws Exception {
+        int result =consumeMapper.insert(detail);
+        System.out.println(detail);
+        if (result != 1) {
+            throw new Exception("Failed to insert another entity");
+        }
         BigDecimal paidGold1 =detail.getRechargeCoin();
         BigDecimal freeGold1 =detail.getFreeCoin();
         BigDecimal taskGold1 =detail.getTaskCoin();
@@ -73,7 +78,7 @@ public class ConsumeServiceImpl implements ConsumeService {
 
 // 设置更新后的Sumgold回到user对象
         System.out.println(user+"----------------------------------------------------------");
-        int result = userMapper.update(user);
+         result = userMapper.update(user);
         if (result != 1) {
             throw new Exception("Failed to insert another entity");
         }
@@ -81,7 +86,7 @@ public class ConsumeServiceImpl implements ConsumeService {
         String uuid = UUID.randomUUID().toString().replace("-", ""); // 去掉UUID中的'-'
         detail.setOrderCode(uuid);
         //添加表单数据
-        result =consumeMapper.insert(detail);
+
 
 
         //消费完成后需要将用户的三币从user表中去掉