From 2efab94a0d0ff6eb3faf780101e1371049dd7611 Mon Sep 17 00:00:00 2001
From: jihaipeng <3204568531@qq.com>
Date: Sun, 27 Jul 2025 17:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java   | 2 +-
 .../java/com/lottery/admin/service/Impl/FundingServiceImpl.java     | 4 ++--
 .../java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java    | 2 +-
 .../java/com/lottery/api/service/Impl/UserDetailServiceImpl.java    | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java
index a2e90b2..070a9d1 100644
--- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java
+++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java
@@ -15,5 +15,5 @@ public class PageSimpleDto {
 
     private Integer pageNum;
 
-    private Integer pageSize;
+        private Integer pageSize;
 }
diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
index 526e147..cfbd586 100644
--- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
+++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
@@ -328,8 +328,8 @@ public class FundingServiceImpl implements IFundingService {
         }
         //查询当前的虚拟
         Integer virtual = fundingMapper.searchVirtual(activityId, stock);
-        if(total + addTotal+markerTwoVirtual > 1500){
-            return Result.failure("所在市场助力值最大1500");
+        if(total + addTotal+markerTwoVirtual > 4200){
+            return Result.failure("所在市场助力值最大4200");
         }
 
         if(total + addTotal + markerTwoVirtual< 0){
diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java
index 077bffc..95b4c58 100644
--- a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java
+++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java
@@ -196,7 +196,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
             }
             Integer Show = markerTwoTotal + markerTwoVirtual;
 
-            if((Show+1)>1500){
+            if((Show+1)>4200){
                 return  Result.failure(200,"美股实时数据助力成功！");
             }
             // 提取 username
diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java
index 5ca63e4..484d0f0 100644
--- a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java
+++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java
@@ -194,7 +194,7 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
 //            List<User> supplementWinners = randomSelectUsers(allAvailableUsers, Math.min(remaining, allAvailableUsers.size()));
 //            winners.addAll(convertToUserVoList(supplementWinners));
 //            markUsersAsWinners(supplementWinners, startLotteryDto);
-//        }
+//        } requir
         if (winners.size() < requiredWinners) {
             int remaining = requiredWinners - winners.size();
             List<User> allAvailableUsers = getAllAvailableUsers(startLotteryDto.getGradeId());
@@ -398,13 +398,13 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
 
                 // 4. 如果不存在任何记录，则插入新记录
 
-                String cnName = fundingMapper.updateLocMarketToCn(user.getLocMarket());
+//                String cnName = fundingMapper.updateLocMarketToCn(user.getLocMarket());
                 WinnerRecord winnerRecord = WinnerRecord.builder()
                         .userId(user.getId())
                         .winTime(new Date())
                         .prizeId(startLotteryDto.getPrizeId())
                         .isDel(0) // 明确设置为未删除
-                        .locMarket(cnName)
+                        .locMarket(user.getLocMarket())
                         .build();
                 adminWinMapper.insert(winnerRecord);
             }