Merge branch 'milestone-20250723-wwl' of http://39.101.133.168:8807/qimaohong/ActivityProject into milestone-20250723-wwl

# Conflicts:合并代码
#	lottery-system/lottery-pojo/src/main/java/com/lottery/entity/WinnerRecord.java
#	lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java

lottery-system/lottery-pojo/src/main/java/com/lottery/entity/WinnerRecord.java

@@ -34,13 +34,15 @@ public class WinnerRecord {
 
     private Long prizeId; // 奖品ID
 
+    @TableField("loc_market")
+    private String locMarket;
+
     @TableField("is_del")
     private int isDel;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date winTime; // 中奖时间
 
-    @TableField("loc_market")
-    private String locMarket;
+
 
 }

lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java

@@ -43,4 +43,7 @@ public interface ApiIFundingMapper {
     Integer selectActivityISExist(Integer activityId);
 
     Integer selectMarketISExist(Integer market);
+
+    String selectBYMarket(String locMarket1);
+
 }

lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java

@@ -202,7 +202,9 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
             // 提取 username
             String username = rootNode.path("data").path("username").asText();
             String jwcode = rootNode.path("data").path("jwcode").asText();
-            String locMarket  = rootNode.path("data").path("loc_market").asText();
+            String locMarket1  = rootNode.path("data").path("loc_market").asText();
+            //通过
+            String locMarket = fundingMapper.selectBYMarket(locMarket1);
 
             LocalDateTime joinTime = LocalDateTime.now();
 

lottery-system/lottery-service/src/main/resources/mapper/api/ApiIFundingService.xml

@@ -113,6 +113,13 @@
         WHERE
             id = #{market}
     </select>
-
+    <select id="selectBYMarket" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT
+            text
+        FROM
+            market
+        WHERE
+            market = #{locMarket1}
+    </select>
 
 </mapper>