From b28d69f6cba1a7aed03fd9c07a14693281f9a9a0 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 12 三月 2024 14:16:22 +0800 Subject: [PATCH] 修改bug --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 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 3d4bd37..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 @@ -101,7 +101,16 @@ 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") @@ -404,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)); } @@ -635,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(); } @@ -691,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); } @@ -797,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