From c7e142a187e4ae91c2363008e7a8c77967d9bd63 Mon Sep 17 00:00:00 2001 From: willy <2462310981@qq.com> Date: Sat, 26 Jul 2025 19:30:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lottery/entity/WinnerRecord.java | 2 -- .../main/java/com/lottery/admin/mapper/IFundingMapper.java | 2 ++ .../lottery/admin/service/Impl/AdminPrizeServiceImpl.java | 10 ++++++++-- .../admin/service/Impl/AdminUserDetailServiceImpl.java | 8 +++++++- .../lottery/admin/service/Impl/AdminUserServiceImpl.java | 14 +++++++------- .../lottery/api/service/Impl/UserDetailServiceImpl.java | 7 ++++++- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/WinnerRecord.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/WinnerRecord.java index 78a7454..f9743b0 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/WinnerRecord.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/WinnerRecord.java @@ -34,8 +34,6 @@ public class WinnerRecord { private Long prizeId; // 奖品ID - private String locMarket; - @TableField("is_del") private int isDel; diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java index 746603a..f23eb2d 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/mapper/IFundingMapper.java +++ b/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); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminPrizeServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminPrizeServiceImpl.java index 60c2cd1..99800f6 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminPrizeServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminPrizeServiceImpl.java @@ -215,6 +215,9 @@ public class AdminPrizeServiceImpl extends ServiceImpl 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 // 调用接口 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 .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(); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserDetailServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserDetailServiceImpl.java index fb9527a..3520998 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserDetailServiceImpl.java +++ b/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 listFixUser(int pageNum, int pageSize, UserQueryDto userQueryDto) { @@ -526,6 +529,8 @@ public class AdminUserDetailServiceImpl extends ServiceImpl 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 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 imp } - private User convertToEntity(UserImportDto dto) { User user = new User(); user.setJwcode(dto.getJwcode()); @@ -384,7 +383,8 @@ public class AdminUserServiceImpl extends ServiceImpl 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; 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 8e55e90..5ca63e4 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 @@ -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 winners, StartLotteryDto startLotteryDto) throws Exception { @@ -394,12 +397,14 @@ public class UserDetailServiceImpl extends ServiceImpl