From 3eb56c3c2cbd87a04c884f584b3f168dd500488a Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Wed, 19 Mar 2025 10:05:59 +0800
Subject: [PATCH] =?UTF-8?q?3.18=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=A4=9A=E5=9C=B0=E5=8C=BA=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 4 ++--
 src/main/java/com/example/demo/domain/vo/DetailYgold.java | 3 +++
 src/main/resources/application.yml                        | 1 +
 src/main/resources/mapper/ConsumeMapper.xml               | 2 +-
 src/main/resources/mapper/DetailYMapper.xml               | 6 +++---
 src/main/resources/mapper/RechargeMapper.xml              | 2 +-
 src/main/resources/mapper/RefundMapper.xml                | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 09fb9bb..bf598a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
-<!--	<version>0.0.3-SNAPSHOT</version>-->
+<!--	<version>0.0.2-SNAPSHOT</version>-->
+	<version>0.0.3-SNAPSHOT</version>
 	<name>demo</name>
 	<description>demo</description>
 
diff --git a/src/main/java/com/example/demo/domain/vo/DetailYgold.java b/src/main/java/com/example/demo/domain/vo/DetailYgold.java
index aa256ef..32998b1 100644
--- a/src/main/java/com/example/demo/domain/vo/DetailYgold.java
+++ b/src/main/java/com/example/demo/domain/vo/DetailYgold.java
@@ -4,6 +4,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 @NoArgsConstructor
 public class DetailYgold {
@@ -25,4 +27,5 @@ public class DetailYgold {
 
     private String sortField;
     private String sortOrder;
+    private List<String> areas;
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0a591f4..8044f2e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -31,6 +31,7 @@ spring:
       cache-null-values: true
   data:
     redis:
+      database: 2
       host: 54.251.137.151
       port: 10703
       password: 8912h12jhhajsd
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 3f3b8c1..bbfd219 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -64,7 +64,7 @@
             </if>
         </where>
         <choose>
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>
diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml
index 56e32b2..d4258ce 100644
--- a/src/main/resources/mapper/DetailYMapper.xml
+++ b/src/main/resources/mapper/DetailYMapper.xml
@@ -53,7 +53,7 @@
     </where>
     <choose>
         <!-- 优先使用前端传入的排序参数 -->
-        <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+        <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
             ORDER BY ${sortField} ${sortOrder}
         </when>
         <!-- 默认排序 -->
@@ -112,7 +112,7 @@
         </where>
         <choose>
             <!-- 优先使用前端传入的排序参数 -->
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <!-- 默认排序 -->
@@ -211,7 +211,7 @@
         GROUP BY
         user_gold.jwcode
         <choose>
-            <when test='sortField != null or sortOrder != null'>
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 369dc4f..448b503 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -115,7 +115,7 @@
             </if>
         </where>
         <choose>
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index fc4a36a..c6f5548 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -97,7 +97,7 @@
             </if>
         </where>
         <choose>
-            <when test="sortField != null and sortField >0 or sortOrder != null and sortOrder >0">
+            <when test="sortField != null and sortField.length >0 or sortOrder != null and sortOrder.length >0">
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>