From 8bc41b60d66b188d240bb54d0439f2dcfae062bd Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Tue, 1 Jul 2025 15:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E4=B8=8A=E6=8E=A5=E5=8F=A3+=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                        | 10 ++++++++++
 .../java/com/example/demo/controller/ConsumeController.java    |  1 +
 src/main/java/com/example/demo/domain/vo/ConsumeUser.java      |  1 +
 src/main/resources/mapper/RechargeMapper.xml                   |  1 +
 4 files changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 216c74b..cf6eee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,16 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.4.6</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.0.2</version> <!-- Jakarta Validation规范版本 -->
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>8.0.0.Final</version> <!-- 对应Spring Boot 3的实现版本 -->
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java
index 51c2411..9ddf11b 100644
--- a/src/main/java/com/example/demo/controller/ConsumeController.java
+++ b/src/main/java/com/example/demo/controller/ConsumeController.java
@@ -6,6 +6,7 @@ import com.example.demo.domain.vo.Gold;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.service.ConsumeService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/ConsumeUser.java
index 40768ea..d2370ce 100644
--- a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java
+++ b/src/main/java/com/example/demo/domain/vo/ConsumeUser.java
@@ -1,6 +1,7 @@
 package com.example.demo.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.PositiveOrZero;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml
index 99d86ad..e8405f8 100644
--- a/src/main/resources/mapper/RechargeMapper.xml
+++ b/src/main/resources/mapper/RechargeMapper.xml
@@ -108,6 +108,7 @@
                     <choose>
                         <!-- 对金币数量的排序处理 -->
                         <when test="sortField == 'permanentGold'">ugr.permanent_gold</when>
+                        <when test="sortField == 'money'">ugr.money</when>
                         <when test="sortField == 'freeGold'">(COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0))</when>
                         <!-- 对时间字段的排序处理 -->
                         <when test="sortField == 'payTime'">ugr.pay_time</when>