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-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java

@@ -95,4 +95,6 @@ public interface IFundingMapper {
     @Update("update z_user set loc_market = #{locMarket} where jwcode = #{jwcode}")
     void updateLocMarket(String jwcode, String locMarket);
 
+    @Select("select text from market where market = #{locMarket}")
+    String updateLocMarketToCn(String locMarket);
 }

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminPrizeServiceImpl.java

@@ -215,6 +215,9 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
         prizeVo.setGradeName(grade.getGradeName());
         return prizeVo;
     }
+    
+    @Autowired
+    private IFundingMapper fundingMapper;
 
     @Override
     public Result addWinUser(FixUserDto fixUserDto) throws Exception {
@@ -252,14 +255,17 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
         // 调用接口
         String response = HttpUtils.postUrlencoded(url, params);
         JsonNode rootNode = objectMapper.readTree(response);
+        String locMarket = rootNode.path("data").path("loc_market").asText();
         if(rootNode.path("code").asInt() == 401){
             throw new BusinessException(400, "精网号错误");
         }
-
+        
+        
 
         try {
             // 1. 检查用户是否存在，不存在则创建
             Long userId = adminUserMapper.selectByJwcode(fixUserDto.getJwcode());
+            String s = fundingMapper.updateLocMarketToCn(locMarket);
             if (userId == null) {
                 User user = User.builder()
                         .username(fixUserDto.getUsername())
@@ -269,7 +275,7 @@ public class AdminPrizeServiceImpl extends ServiceImpl<AdminPrizeMapper, Prize>
                         .isDel(0)
                         .createTime(new Date())
                         .updateTime(new Date())
-                        .locMarket(rootNode.path("data").path("loc_market").asText())
+                        .locMarket(s)
                         .build();
                 adminUserMapper.insert(user);
                 userId = user.getId();

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lottery.admin.mapper.AdminGradeMapper;
 import com.lottery.admin.mapper.AdminUserDetailMapper;
 import com.lottery.admin.mapper.AdminUserMapper;
+import com.lottery.admin.mapper.IFundingMapper;
 import com.lottery.admin.service.AdminUserDetailService;
 import com.lottery.admin.service.AdminUserService;
 import com.lottery.api.mapper.IUserDetailMapper;
@@ -55,6 +56,8 @@ public class AdminUserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, U
 
     @Autowired
     private AdminGradeMapper adminGradeMapper;
+    @Autowired
+    private FundingServiceImpl fundingServiceImpl;
 
     @Override
     public PageInfo<UserVo> listFixUser(int pageNum, int pageSize, UserQueryDto userQueryDto) {
@@ -526,6 +529,8 @@ public class AdminUserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, U
             throw new IllegalArgumentException("第" + rowNum + "行: 精网号在当前文件中重复");
         }
     }
+    @Autowired
+    private IFundingMapper fundingMapper;
 
     private User convertToEntity(UserImportDto dto) {
         User user = new User();
@@ -535,7 +540,8 @@ public class AdminUserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, U
         user.setUpdateTime(new Date());
         // 查询并设置loc_market
         String locMarket = adminUserMapper.selectLocMarketByJwcode(dto.getJwcode());
-        user.setLocMarket(locMarket != null ? locMarket : "未知"); // 默认值
+        String s = fundingMapper.updateLocMarketToCn(locMarket);
+        user.setLocMarket(s); // 默认值
         // 密码加密
         user.setPassword("123456");
         return user;

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserServiceImpl.java

@@ -11,10 +11,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lottery.LotteryApplication;
 import com.lottery.admin.controller.AdminUserController;
-import com.lottery.admin.mapper.AdminIsLoginMapper;
-import com.lottery.admin.mapper.AdminUserDetailMapper;
-import com.lottery.admin.mapper.AdminUserMapper;
-import com.lottery.admin.mapper.AdminWinMapper;
+import com.lottery.admin.mapper.*;
 import com.lottery.admin.service.AdminUserService;
 import com.lottery.config.ApiConfig;
 import com.lottery.config.ApiConfig;
@@ -136,6 +133,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, User> imp
         redisTemplate.opsForValue().set( "token:"+token, adminLogin.getUsername(),24, TimeUnit.HOURS);
         return Result.success(userLoginVo);
     }
+    @Autowired
+    private IFundingMapper fundingMapper;
 
     @Override
     public boolean addUser(@Valid UserDto userDto) throws Exception {
@@ -184,7 +183,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, User> imp
         user.setIsDel(0);
         user.setCreateTime(new Date());
         user.setUpdateTime(new Date());
-        user.setLocMarket(locMarket);
+        String cnName = fundingMapper.updateLocMarketToCn(locMarket);
+        user.setLocMarket(cnName);
         user.setPassword("123456"); // 默认密码
 
         return this.save(user);
@@ -373,7 +373,6 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, User> imp
     }
 
 
-
     private User convertToEntity(UserImportDto dto) {
         User user = new User();
         user.setJwcode(dto.getJwcode());
@@ -384,7 +383,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, User> imp
         user.setIsDel(0);
         // 查询并设置loc_market
         String locMarket = adminUserMapper.selectLocMarketByJwcode(dto.getJwcode());
-        user.setLocMarket(locMarket != null ? locMarket : "未知"); // 默认值
+        String s = fundingMapper.updateLocMarketToCn(locMarket);
+        user.setLocMarket(s); // 默认值
         // 设置默认密码
         user.setPassword("123456");
         return user;

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

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lottery.admin.controller.AdminPrizeController;
 import com.lottery.admin.mapper.AdminPrizeMapper;
 import com.lottery.admin.mapper.AdminWinMapper;
+import com.lottery.admin.mapper.IFundingMapper;
 import com.lottery.api.mapper.IGradeMapper;
 import com.lottery.api.mapper.IUserDetailMapper;
 import com.lottery.api.mapper.IUserMapper;
@@ -347,6 +348,8 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
                 .collect(Collectors.toList());
     }
 
+    @Autowired
+    private IFundingMapper fundingMapper;
     private final static Logger LOGGER = LoggerFactory.getLogger(UserDetailServiceImpl.class);
     // 标记用户为中奖状态
     private void markUsersAsWinners(List<User> winners, StartLotteryDto startLotteryDto) throws Exception {
@@ -394,12 +397,14 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
 //                }
 
                 // 4. 如果不存在任何记录，则插入新记录
+
+                String cnName = fundingMapper.updateLocMarketToCn(user.getLocMarket());
                 WinnerRecord winnerRecord = WinnerRecord.builder()
                         .userId(user.getId())
                         .winTime(new Date())
                         .prizeId(startLotteryDto.getPrizeId())
                         .isDel(0) // 明确设置为未删除
-                        .locMarket(user.getLocMarket() != null ? user.getLocMarket() : "else")
+                        .locMarket(cnName)
                         .build();
                 adminWinMapper.insert(winnerRecord);
             }