From a8e21903f13d408265ccd1e966b540b5c608a41b Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Thu, 14 Aug 2025 13:28:25 +0800
Subject: [PATCH] =?UTF-8?q?8.14=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/coin/GoldDetailController.java | 24 ++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/coin/GoldDetailController.java b/src/main/java/com/example/demo/controller/coin/GoldDetailController.java
index ea0f61b..a498e85 100644
--- a/src/main/java/com/example/demo/controller/coin/GoldDetailController.java
+++ b/src/main/java/com/example/demo/controller/coin/GoldDetailController.java
@@ -85,8 +85,10 @@ public class GoldDetailController {
             }
         } else {
             // 如果传入的市场为空，则设置默认市场
-            if (!markets.contains("9") || !markets.contains("9999")) {
-                page.getGoldDetail().setMarkets(markets); // 设置默认市场
+            if (markets.contains("9") || markets.contains("9999")) {
+                page.getGoldDetail().setMarkets(null); // 包含 9 或 9999，传 null
+            } else {
+                page.getGoldDetail().setMarkets(markets); // 不包含，传原值
             }
         }
 
@@ -121,8 +123,10 @@ public class GoldDetailController {
             }
         } else {
             // 如果传入的市场为空，则设置默认市场
-            if (!markets.contains("9") || !markets.contains("9999")) {
-                page.getGoldDetail().setMarkets(markets); // 设置默认市场
+            if (markets.contains("9") || markets.contains("9999")) {
+                page.getGoldDetail().setMarkets(null); // 包含 9 或 9999，传 null
+            } else {
+                page.getGoldDetail().setMarkets(markets); // 不包含，传原值
             }
         }
         return Result.success(goldDetailService.sumGold(pageNum,pageSize,goldDetail));
@@ -150,8 +154,10 @@ public class GoldDetailController {
             }
         } else {
             // 如果传入的市场为空，则设置默认市场
-            if (!markets.contains("9") || !markets.contains("9999")) {
-                user.setMarkets(markets); // 设置默认市场
+            if (markets.contains("9") || markets.contains("9999")) {
+                user.setMarkets(null); // 包含 9 或 9999，传 null
+            } else {
+                user.setMarkets(markets); // 不包含，传原值
             }
         }
         return Result.success(goldDetailService.GoldTotal(user));
@@ -186,8 +192,10 @@ public class GoldDetailController {
             }
         } else {
             // 如果传入的市场为空，则设置默认市场
-            if (!markets.contains("9") || !markets.contains("9999")) {
-                page.getUser().setMarkets(markets); // 设置默认市场
+            if (markets.contains("9") || markets.contains("9999")) {
+                page.getUser().setMarkets(null); // 包含 9 或 9999，传 null
+            } else {
+                page.getUser().setMarkets(markets); // 不包含，传原值
             }
         }
         return Result.success(goldDetailService.getGold(page.getPageNum(), page.getPageSize(), page.getUser()));