From 5a993e1ddaae2484738933ab8c0f1c3e5883d513 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Fri, 29 Nov 2024 17:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/commons/domain/entity/Activity.java    |  5 +++-
 .../com/example/commons/domain/entity/Audit.java   |  1 +
 .../example/commons/domain/vo/ConsumeDetail.java   | 35 ++++++++++++++++++++++
 .../example/recharge/mapper/RechargeMapper.java    |  4 +--
 4 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java

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({
             "<script>",
-            "SELECT user.`name` as user_name , recharge.*,activity.activity_name,audit.`status`, admin.`name`  FROM recharge",
+            "SELECT DISTINCT user.`name` as user_name , recharge.*,activity.activity_name,audit.`status`,audit.reson, admin.`name`  FROM recharge",
                     "INNER JOIN audit ON recharge.recharge_id = audit.recharge_id",
                     "INNER JOIN `user` ON recharge.homily_id = `user`.homily_id",
                     "INNER JOIN activity on recharge.activity_id = activity.activity_id",
-                    "INNER JOIN admin on recharge.admin_id = admin.admin_id",
+                    "INNER JOIN `admin` on recharge.admin_id = `admin`.admin_id",
             "<where>",
             "flag='1'",
             "<if test='activityId!=null'>and activity_id=#{activityId}</if>",