diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserDto.java index 9c42005..48a62d7 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserDto.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserDto.java @@ -28,7 +28,8 @@ public class UserDto { private String username; - @Pattern(regexp = "^\\d{5,12}$", message = "精网号必须是5到12位的数字") + @Size(min = 8, max = 8, message = "jwcode必须是8位") + @Pattern(regexp = "^\\d{8}$", message = "jwcode必须全是数字") @NotNull(message = "精网号不能为空") private String jwcode; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserImportDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserImportDto.java index e6a0aef..f458222 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserImportDto.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/UserImportDto.java @@ -3,6 +3,10 @@ package com.lottery.dto; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + /** * @program: lottery * @ClassName UserImportDto diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/WinUserExportDto.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/WinUserExportDto.java index 5ae78c4..2084376 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/WinUserExportDto.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/dto/WinUserExportDto.java @@ -28,4 +28,7 @@ public class WinUserExportDto { @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date winTime; + @ExcelProperty("所在地区") + private String locMarket; + } \ No newline at end of file diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingExport.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingExport.java index d0d1d07..7e7f00f 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingExport.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingExport.java @@ -39,4 +39,7 @@ public class FundingExport { public LocalDateTime getJoinTime() { return joinTime; } + + @ExcelProperty("所在地区") + private String locMarket; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingUser.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingUser.java index d8236ac..7f2d5ff 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingUser.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/FundingUser.java @@ -31,4 +31,6 @@ public class FundingUser { private String jwcode; // 用户唯一码 private LocalDateTime joinTime; // 参与时间 private Integer activityId; // 关联的活动ID + + private String locMarket; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/User.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/User.java index b77604f..8d68e5c 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/User.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/entity/User.java @@ -40,6 +40,8 @@ public class User { private int isDel; + private String locMarket; + private Date createTime; // 创建时间 private Date updateTime; // 更新时间 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 26be3c5..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 @@ -40,4 +40,7 @@ public class WinnerRecord { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date winTime; // 中奖时间 + @TableField("loc_market") + private String locMarket; + } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingUserVo.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingUserVo.java index 750cd0c..addcb6a 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingUserVo.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/FundingUserVo.java @@ -22,4 +22,5 @@ public class FundingUserVo { private String username; // 用户名 private String jwcode; // 用户唯一码 private LocalDateTime joinTime; // 参与时间 + private String locMarket; } diff --git a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/WinUserVo.java b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/WinUserVo.java index 5525c80..24b7d10 100644 --- a/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/WinUserVo.java +++ b/lottery-system/lottery-pojo/src/main/java/com/lottery/vo/WinUserVo.java @@ -27,7 +27,8 @@ public class WinUserVo { private String prizeName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date winTime; // 中奖时间; + + private String locMarket; } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java index 0663547..c6f9a99 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminGradeController.java @@ -52,6 +52,7 @@ public class AdminGradeController { if (pageSimpleDto.getPageNum() == null) { pageSimpleDto.setPageNum(1); } + if (pageSimpleDto.getPageSize() == null) { pageSimpleDto.setPageSize(10); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminPrizeController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminPrizeController.java index 8b8bd37..0fca979 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminPrizeController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminPrizeController.java @@ -80,7 +80,7 @@ public class AdminPrizeController { //新增内定 @PostMapping("/addFixUser") - public Result addWinUser(@RequestBody @Valid FixUserDto fixUserDto) { + public Result addWinUser(@RequestBody @Valid FixUserDto fixUserDto) throws Exception { return adminPrizeService.addWinUser(fixUserDto); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java index 350e6cb..408c11a 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/controller/AdminUserController.java @@ -52,7 +52,7 @@ public class AdminUserController { private com.lottery.propertise.jwtPropertice jwtPropertice; @PostMapping("/add") - public Result add(@RequestBody @Valid UserDto userDto) { + public Result add(@RequestBody @Valid UserDto userDto) throws Exception { LOGGER.info("新增用户：{}",userDto); if (!adminUserService.addUser(userDto)){ diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminPrizeService.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminPrizeService.java index f467695..eb98584 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminPrizeService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminPrizeService.java @@ -25,7 +25,7 @@ public interface AdminPrizeService extends IService { PrizeVo getPrizeById(Long id); - Result addWinUser(FixUserDto fixUserDto); + Result addWinUser(FixUserDto fixUserDto) throws Exception; boolean removePrizeById(Long id); } diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminUserService.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminUserService.java index 130cf75..8263464 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminUserService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminUserService.java @@ -32,7 +32,7 @@ public interface AdminUserService extends IService { Result AdminUserlogin(AdminLogin adminLogin); - boolean addUser(UserDto userDto); + boolean addUser(UserDto userDto) throws Exception; PageInfo listUser(int pageNum, int pageSize, UserQueryDto userQueryDto); 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 909db91..60c2cd1 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 @@ -5,13 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.lottery.admin.mapper.*; import com.lottery.admin.service.AdminPrizeService; +import com.lottery.config.ApiConfig; import com.lottery.dto.PrizeDto; import com.lottery.dto.FixUserDto; import com.lottery.entity.*; +import com.lottery.exception.BusinessException; import com.lottery.result.Result; import com.lottery.utils.ConvertBeanUtil; +import com.lottery.utils.HttpUtils; import com.lottery.vo.PageInfo; import com.lottery.vo.PrizeVo; import org.apache.ibatis.annotations.Lang; @@ -20,7 +25,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @program: lottery @@ -47,6 +54,11 @@ public class AdminPrizeServiceImpl extends ServiceImpl @Autowired private AdminWinMapper adminWinMapper; + @Autowired + private ApiConfig apiConfig; + @Autowired + private ObjectMapper objectMapper; + @Override public PageInfo pageListPrize(int pageNum, int pageSize) { Page page = new Page<>(pageNum, pageSize); @@ -205,7 +217,7 @@ public class AdminPrizeServiceImpl extends ServiceImpl } @Override - public Result addWinUser(FixUserDto fixUserDto) { + public Result addWinUser(FixUserDto fixUserDto) throws Exception { // //先判断新增的内定用户是否在总的抽奖用户中 // Long userId = adminUserMapper.selectByJwcode(fixUserDto.getJwcode()); @@ -232,6 +244,18 @@ public class AdminPrizeServiceImpl extends ServiceImpl // userDetail.setIsFixed(1); // userDetail.setIsDel(0); // adminUserDetailMapper.insert(userDetail); + String url = apiConfig.getHljwUrl() + "/api/v2/member/info"; + String jwcode = fixUserDto.getJwcode(); + // 准备请求参数 + Map params = new HashMap<>(); + params.put("jwcode", jwcode); + // 调用接口 + String response = HttpUtils.postUrlencoded(url, params); + JsonNode rootNode = objectMapper.readTree(response); + if(rootNode.path("code").asInt() == 401){ + throw new BusinessException(400, "精网号错误"); + } + try { // 1. 检查用户是否存在，不存在则创建 @@ -245,6 +269,7 @@ public class AdminPrizeServiceImpl extends ServiceImpl .isDel(0) .createTime(new Date()) .updateTime(new Date()) + .locMarket(rootNode.path("data").path("loc_market").asText()) .build(); adminUserMapper.insert(user); userId = user.getId(); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserServiceImpl.java index ac79771..49ee511 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminUserServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.lottery.LotteryApplication; import com.lottery.admin.controller.AdminUserController; import com.lottery.admin.mapper.AdminIsLoginMapper; @@ -13,6 +15,7 @@ import com.lottery.admin.mapper.AdminUserDetailMapper; import com.lottery.admin.mapper.AdminUserMapper; import com.lottery.admin.mapper.AdminWinMapper; import com.lottery.admin.service.AdminUserService; +import com.lottery.config.ApiConfig; import com.lottery.dto.AdminLogin; import com.lottery.dto.UserDto; import com.lottery.dto.UserImportDto; @@ -20,8 +23,10 @@ import com.lottery.dto.UserQueryDto; import com.lottery.entity.User; import com.lottery.entity.UserDetail; import com.lottery.entity.WinnerRecord; +import com.lottery.exception.BusinessException; import com.lottery.result.Result; import com.lottery.utils.ConvertBeanUtil; +import com.lottery.utils.HttpUtils; import com.lottery.utils.JwtUtil; import com.lottery.vo.PageInfo; import com.lottery.vo.UserLoginVo; @@ -39,6 +44,7 @@ import org.json.JSONObject; import javax.persistence.criteria.CriteriaBuilder; import javax.transaction.Transactional; import javax.validation.Valid; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -60,8 +66,12 @@ public class AdminUserServiceImpl extends ServiceImpl imp private AdminUserMapper adminUserMapper; private final static Logger LOGGER = LoggerFactory.getLogger(AdminUserController.class); + @Autowired + private ApiConfig apiConfig; @Autowired + private ObjectMapper objectMapper; + @Autowired private StringRedisTemplate redisTemplate; @Autowired @@ -126,8 +136,23 @@ public class AdminUserServiceImpl extends ServiceImpl imp } @Override - public boolean addUser(@Valid UserDto userDto) { + public boolean addUser(@Valid UserDto userDto) throws Exception { String jwcode = userDto.getJwcode(); + //TODO 接入API + // 1. 定义请求 URL + String url = apiConfig.getHljwUrl() + "/api/v2/member/info"; + + // 准备请求参数 + Map params = new HashMap<>(); + params.put("jwcode", jwcode); + // 调用接口 + String response = HttpUtils.postUrlencoded(url, params); + JsonNode rootNode = objectMapper.readTree(response); + if(rootNode.path("code").asInt() == 401){ + throw new BusinessException(400, "精网号错误"); + } + + String locMarket = rootNode.path("data").path("loc_market").asText(); User user1 = adminUserMapper.selectByName(userDto.getUsername()); if (user1 != null) { @@ -157,6 +182,7 @@ public class AdminUserServiceImpl extends ServiceImpl imp user.setIsDel(0); user.setCreateTime(new Date()); user.setUpdateTime(new Date()); + user.setLocMarket(locMarket); user.setPassword("123456"); // 默认密码 return this.save(user); @@ -191,6 +217,14 @@ public class AdminUserServiceImpl extends ServiceImpl imp .sheet() .doReadSync(); // 同步读取所有数据，适用于读取量小的场景 + + // 2. 分批处理（每批2000条） + int batchSize = 2000; + int totalSuccess = 0; + int totalSkip = 0; + List errorMessages = new ArrayList<>(); + + // 2. 获取已存在的精网号及其删除状态 Map existingUserMap = adminUserMapper.selectAllUserCodesWithDelStatus() .stream() diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminWinServiceImpl.java b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminWinServiceImpl.java index bc484a8..cd041c5 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminWinServiceImpl.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminWinServiceImpl.java @@ -148,6 +148,7 @@ public class AdminWinServiceImpl extends ServiceImpl listWinUserWin(int pageNum, int pageSize) { @@ -214,6 +215,7 @@ public class AdminWinServiceImpl extends ServiceImpl StartLottery(@RequestBody StartLotteryDto startLotteryDto){ + public Result StartLottery(@RequestBody StartLotteryDto startLotteryDto) throws Exception { LOGGER.info("开始抽奖: 等级是：{}，奖品是：{}，抽取人数：{}",startLotteryDto.getGradeId(),startLotteryDto.getPrizeId(),startLotteryDto.getPerWin()); LotteryVo userVos = userDetailService.StartLottery(startLotteryDto); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java index 744e2aa..04212d8 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/mapper/ApiIFundingMapper.java @@ -30,7 +30,7 @@ public interface ApiIFundingMapper { Integer selectStatus(); - void addRecord(Integer activityId, String username, String jwcode, Integer marketSign, LocalDateTime joinTime); + void addRecord(Integer activityId, String username, String jwcode, Integer marketSign, LocalDateTime joinTime,String locMarket); LocalDate selectCount(String jwcode, Integer marketSign,Integer activityId); diff --git a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserDetailService.java b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserDetailService.java index 5de8eb2..8cfac34 100644 --- a/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserDetailService.java +++ b/lottery-system/lottery-service/src/main/java/com/lottery/api/service/IUserDetailService.java @@ -14,5 +14,5 @@ import com.lottery.vo.LotteryVo; * @Version 1.0 **/ public interface IUserDetailService extends IService { - LotteryVo StartLottery(StartLotteryDto startLotteryDto); + LotteryVo StartLottery(StartLotteryDto startLotteryDto) throws Exception; } 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 d24a3cf..f29d5db 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 @@ -202,14 +202,20 @@ 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(); + LocalDateTime joinTime = LocalDateTime.now(); + + Integer marketSign = fundingRecordDto.getMarketSign(); Integer activityId = fundingRecordDto.getActivityId(); + //获取最近的助力时间 LocalDate zhulishijian= fundingMapper.selectIsZhuli(activityId, jwcode, marketSign); - if(zhulishijian==null || !zhulishijian.isEqual(LocalDate.now())){ + + if(zhulishijian==null || !zhulishijian.isEqual(LocalDate.now())) { //添加到数据库 - fundingMapper.addRecord(activityId, username, jwcode, marketSign, joinTime); + fundingMapper.addRecord(activityId, username, jwcode, marketSign, joinTime, locMarket); }if(zhulishijian.isEqual(LocalDate.now())){ return Result.failure("请勿重复助力"); } 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 0979a43..0cc7616 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 @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.lottery.admin.controller.AdminPrizeController; import com.lottery.admin.mapper.AdminPrizeMapper; import com.lottery.admin.mapper.AdminWinMapper; @@ -11,12 +13,16 @@ import com.lottery.api.mapper.IGradeMapper; import com.lottery.api.mapper.IUserDetailMapper; import com.lottery.api.mapper.IUserMapper; import com.lottery.api.service.IUserDetailService; +import com.lottery.config.ApiConfig; import com.lottery.dto.StartLotteryDto; import com.lottery.entity.Grade; import com.lottery.entity.User; import com.lottery.entity.UserDetail; import com.lottery.entity.WinnerRecord; +import com.lottery.exception.BaseException; import com.lottery.exception.SomeException; +import com.lottery.result.Result; +import com.lottery.utils.HttpUtils; import com.lottery.vo.UserVo; import com.lottery.vo.LotteryVo; import org.slf4j.Logger; @@ -53,6 +59,12 @@ public class UserDetailServiceImpl extends ServiceImpl StartLottery(StartLotteryDto startLotteryDto) { // @@ -138,7 +150,7 @@ public class UserDetailServiceImpl extends ServiceImpl winners, StartLotteryDto startLotteryDto) { + private void markUsersAsWinners(List winners, StartLotteryDto startLotteryDto) throws Exception { for (User user : winners) { // 1. 检查该用户是否已有有效中奖记录(is_del=0) LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -363,12 +375,31 @@ public class UserDetailServiceImpl extends ServiceImpl params = new HashMap<>(); +// +// params.put("jwcode", user.getJwcode()); // 如果接口需要 token 作为参数 +// // 调用接口 +// String response = HttpUtils.postUrlencoded(url, params); +// JsonNode rootNode = objectMapper.readTree(response); +// String locMarket = ""; +// if(rootNode.path("code").asInt() == 401){ +// locMarket = "else"; +// }else{ +// locMarket = rootNode.path("data").path("loc_market").asText(); +// } + // 4. 如果不存在任何记录，则插入新记录 WinnerRecord winnerRecord = WinnerRecord.builder() .userId(user.getId()) .winTime(new Date()) .prizeId(startLotteryDto.getPrizeId()) .isDel(0) // 明确设置为未删除 + .locMarket(user.getLocMarket()) .build(); adminWinMapper.insert(winnerRecord); } diff --git a/lottery-system/lottery-service/src/main/resources/application.yml b/lottery-system/lottery-service/src/main/resources/application.yml index 6914112..ef374a5 100644 --- a/lottery-system/lottery-service/src/main/resources/application.yml +++ b/lottery-system/lottery-service/src/main/resources/application.yml @@ -1,7 +1,7 @@ spring: # 基础配置 (所有环境通用) profiles: - active: prod + active: dev # Jackson 基础配置 jackson: diff --git a/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml b/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml index 9300783..4e29fac 100644 --- a/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml +++ b/lottery-system/lottery-service/src/main/resources/mapper/admin/fundingMapper.xml @@ -106,7 +106,7 @@