修改

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
@@ -32,7 +33,8 @@ public class UserDetailExport {
     private BigDecimal count;
     @ExcelProperty("更新类型")
     @ColumnWidth(20)
-    private int update_type;
+    private Integer updateType;
+
     @ExcelProperty("充值金币")
     @ColumnWidth(20)
     private BigDecimal rechargeCoin;

src/main/java/com/example/demo/domain/vo/DetailExport.java

@@ -1,14 +1,19 @@
 package com.example.demo.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class DetailExport {
 
+    private Integer updateType;
     private String jwcode;
     private String token;
     private String area;

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

@@ -118,8 +118,9 @@ public interface DetailYMapper {
             "FROM detail_y d",
             "LEFT JOIN user u on d.jwcode = u.jwcode ",
             "<where>",
+            "<if test='updateType!=null'>AND d.update_type=#{updateType}</if>",
             "<if test='jwcode!=null'>AND d.jwcode=#{jwcode}</if>",
-            "<if test='area'>AND u.area=#{area}</if>",
+            "<if test='area != null '>AND u.area=#{area}</if>",
             "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "</where>",
             "ORDER BY detaily_id desc",

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

@@ -100,6 +100,7 @@ public class AuditServiceImpl implements AuditService {
             BigDecimal paidGold =audit.getPaidGold();
             BigDecimal freeGold =audit.getFreeGold();
             BigDecimal rechargeGold =audit.getRechargeGold();
+
             String remark =audit.getRemark();
             String Way=audit.getRechargeWay();
             String uuid = audit.getOrderCode();
@@ -139,6 +140,7 @@ public class AuditServiceImpl implements AuditService {
 
         System.out.println(uuid+"/*/*/*-/-*/-/*-/-*/-/*-/*-/-*");
         detailY.setOrderCode(uuid);
+        detailY.setFirstRecharge(0);
         System.out.println(detailY);
         result = detailYMapper.add(detailY);
         if (result != 1) {

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 server:
-#  port: 10702
-  port: 10010
+  port: 10702
+#  port: 10010
 
 spring:
   servlet:
@@ -16,8 +16,8 @@ spring:
       connection-timeout: 30000
       pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=GMT%2b8
-    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
+    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=GMT%2b8
+#    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
     username: hwgold
     password: 'AGX4Z3YMxiCG3GR2'
   application:
@@ -30,13 +30,13 @@ spring:
       cache-null-values: true
   data:
     redis:
-#      host: 54.251.137.151
-#      port: 10703
-#      password: 8912h12jhhajsd
-#      timeout: 1000
-      host: 127.0.0.1
-      port: 6379
+      host: 54.251.137.151
+      port: 10703
+      password: 8912h12jhhajsd
       timeout: 1000
+#      host: 127.0.0.1
+#      port: 6379
+#      timeout: 1000
 #      host: 39.99.159.73
 #      port: 20001
 #      password: 8912h12jhhajsd