From d536f51ef63e4cf589ae85aa79e7a7642d774355 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期二, 12 三月 2024 09:40:19 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java index 4a1769b..223f489 100644 --- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java +++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java @@ -91,8 +91,26 @@ @Autowired private IWorldCupPaymentService worldCupPaymentService; - - + /** + * 根据门店id获取门店关系数据 + * @param storeId + * @return + */ + @ResponseBody + @PostMapping("/worldCup/getWorldCupStoreListByStoreId") + public List<WorldCupStore> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){ + return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId)); + } + /** + * 根据门店id修改门店关系数据 + * @param worldCupStores + * @return + */ + @ResponseBody + @PostMapping("/worldCup/updateWorldCupStoreListById") + public Boolean updateWorldCupStoreListById(@RequestBody List<WorldCupStore> worldCupStores){ + return worldCupStoreService.updateBatchById(worldCupStores); + } @ResponseBody @PostMapping("/api/worldCup/getWorldCupStore") @@ -162,11 +180,11 @@ return ResultUtil.error("无效二维码"); } WorldCupPeopleVo worldCupPeopleVo = new WorldCupPeopleVo(); - worldCupPeopleVo.setId(worldCupPaymentParticipant.getId()); + worldCupPeopleVo.setId(worldCupPaymentParticipant.getParticipantId()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); if(worldCupPaymentParticipant.getParticipantType() == 1){ //学员 - TStudent tStudent = studentClient.queryById(worldCupPaymentParticipant.getParticipantId()); + TStudent tStudent = studentClient.queryById(worldCupPaymentParticipant.getParticipantId().intValue()); worldCupPeopleVo.setName(tStudent.getName()); worldCupPeopleVo.setAge(null == tStudent.getBirthday() ? 0 : Integer.valueOf(sdf.format(new Date())) -Integer.valueOf(sdf.format(tStudent.getBirthday()))); worldCupPeopleVo.setAvatar(tStudent.getHeadImg()); @@ -395,7 +413,11 @@ public List<WorldCupStore> getWorldCupStoreList(@RequestBody Integer storeId){ List<WorldCup> worldCupList = worldCupService.list(new QueryWrapper<WorldCup>().in("status", Arrays.asList(1, 2))); List<Integer> collect = worldCupList.stream().map(WorldCup::getId).collect(Collectors.toList()); - return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect).eq("isOpen", 1)); + if(collect.size() == 0){ + return new ArrayList<>(); + } + return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect) + .eq("isOpen", 1)); } @@ -626,7 +648,10 @@ worldCup.setProvinceCode(provinceCode); worldCup.setCity(city.replace("市", "")); worldCup.setCityCode(cityCode); - worldCupService.updateById(worldCup); + WorldCup worldCup1 = worldCupService.getById(worldCup.getId()); + worldCup.setCreateTime(worldCup1.getCreateTime()); + worldCup.setMatchNumber(worldCup1.getMatchNumber()); + worldCupService.updateWorldCupAll(worldCup); return worldCup.getId(); } @@ -682,8 +707,8 @@ */ @ResponseBody @PostMapping("/base/worldCup/endWorldCupCallback") - public void endWorldCupCallback(String custom, Integer red_score, Integer blue){ - worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue); + public void endWorldCupCallback(String custom, Integer red_score, Integer blue_score){ + worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue_score); } @@ -788,6 +813,14 @@ } + @ResponseBody + @PostMapping("/worldCup/getUserGameRecordList") + public Map<String, Object> getUserGameRecordList(@RequestBody WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){ + return worldCupPaymentParticipantService.getUserGameRecordList(worldCupGameStatisticsInfoList); + } + + + /** * 获取用户比赛记录明细 * @param userGameRecordList -- Gitblit v1.7.1