From d3c2b297f3b8efa43037b387d861edba8de9ff64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 12 Sep 2025 14:08:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=B5=8B=E8=AF=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gxwebsoft/shop/entity/ShopDealerApply.java  | 4 ++++
 .../gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml  | 6 ++++++
 .../com/gxwebsoft/shop/param/ShopDealerApplyParam.java   | 8 ++++++++
 src/main/resources/application-dev.yml                   | 9 ++++++---
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java
index b605ab2..fb622cd 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerApply.java
@@ -72,6 +72,10 @@ public class ShopDealerApply implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime contractTime;
 
+    @Schema(description = "到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime expirationTime;
+
     @Schema(description = "驳回原因")
     private String rejectReason;
 
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml
index 779f01b..eb5bb84 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerApplyMapper.xml
@@ -22,6 +22,9 @@
             <if test="param.mobile != null">
                 AND a.mobile LIKE CONCAT('%', #{param.mobile}, '%')
             </if>
+            <if test="param.dealerName != null">
+              AND a.dealer_name LIKE CONCAT('%', #{param.dealerName}, '%')
+            </if>
             <if test="param.refereeId != null">
                 AND a.referee_id = #{param.refereeId}
             </if>
@@ -37,6 +40,9 @@
             <if test="param.auditTime != null">
                 AND a.audit_time = #{param.auditTime}
             </if>
+            <if test="param.expirationTime != null">
+              AND a.expiration_time = #{param.expirationTime}
+            </if>
             <if test="param.rejectReason != null">
                 AND a.reject_reason LIKE CONCAT('%', #{param.rejectReason}, '%')
             </if>
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java
index 0826134..fb4211a 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopDealerApplyParam.java
@@ -52,6 +52,10 @@ public class ShopDealerApplyParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private String applyTime;
 
+    @Schema(description = "到期时间")
+    @QueryField(type = QueryType.EQ)
+    private String expirationTime;
+
     @Schema(description = "审核状态 (10待审核 20审核通过 30驳回)")
     @QueryField(type = QueryType.EQ)
     private Integer applyStatus;
@@ -63,4 +67,8 @@ public class ShopDealerApplyParam extends BaseParam {
     @Schema(description = "驳回原因")
     private String rejectReason;
 
+    @Schema(description = "分销商名称")
+    @QueryField(type = QueryType.EQ)
+    private String dealerName;
+
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ebd0412..411b110 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -7,9 +7,12 @@ server:
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://8.134.169.209:13306/cms_demo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: cms_demo
-    password: EtzJFr4A3c4THZjY
+#    url: jdbc:mysql://8.134.169.209:13306/cms_demo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#    username: cms_demo
+#    password: EtzJFr4A3c4THZjY
+    url: jdbc:mysql://8.134.169.209:13306/modules?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: modules
+    password: 8YdLnk7KsPAyDXGA
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource