切换测试数据库

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;
 

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>

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;
+
 }

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
+#    url: jdbc:mysql://8.134.169.209:13306/cms_demo?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: cms_demo
+#    username: cms_demo
-    password: EtzJFr4A3c4THZjY
+#    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