From fad04923e4a9174bac391d12c59f1ade15b23521 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 05 三月 2024 10:10:19 +0800 Subject: [PATCH] 切换分支 --- cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 148 insertions(+), 3 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 da81fe4..a768280 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.communityWorldCup.entity.WorldCup; +import com.dsh.communityWorldCup.entity.WorldCupCompetitor; import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant; import com.dsh.communityWorldCup.entity.WorldCupStore; import com.dsh.communityWorldCup.feignclient.account.AppUserClient; @@ -21,6 +22,7 @@ import com.dsh.communityWorldCup.service.IWorldCupPaymentParticipantService; import com.dsh.communityWorldCup.service.IWorldCupService; import com.dsh.communityWorldCup.service.IWorldCupStoreService; +import com.dsh.communityWorldCup.util.GDMapGeocodingUtil; import com.dsh.communityWorldCup.util.PayMoneyUtil; import com.dsh.communityWorldCup.util.ResultUtil; import com.dsh.communityWorldCup.util.TokenUtil; @@ -87,6 +89,9 @@ @Autowired private IWorldCupCompetitorService worldCupCompetitorService; + + @Autowired + private GDMapGeocodingUtil gdMapGeocodingUtil; @@ -263,10 +268,12 @@ @ApiOperation(value = "获取世界杯详情【2.0】", tags = {"APP-社区世界杯"}) @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "世界杯id", required = true, dataType = "int"), + @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "string"), + @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "string"), @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id){ - WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id); + public ResultUtil<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id, @RequestBody String lon, @RequestBody String lat){ + WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id, lon, lat); return ResultUtil.success(worldCupInfo); } @@ -448,7 +455,7 @@ @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"), @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(@RequestBody String id){ + public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(String id){ MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id); return ResultUtil.success(myWorldCupInfo); } @@ -481,6 +488,144 @@ } + /** + * 获取学员参与数量 + * @param studentId + * @return + */ + @ResponseBody + @PostMapping("/worldCup/count") + public Integer count(@RequestBody Integer studentId){ + return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>() + .eq("participantId", studentId).eq("participantType", 1)); + } + /** + * 获取学员世界杯胜利次数 + * @param studentId + * @return + */ + @ResponseBody + @PostMapping("/worldCup/winCount") + public Integer winCount(@RequestBody Integer studentId){ + return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>() + .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1)); + } + + + /** + * 添加社区世界杯 + * @param worldCup + * @return + */ + @ResponseBody + @PostMapping("/worldCup/addWorldCup") + public Integer addWorldCup(@RequestBody WorldCup worldCup){ + String lon = worldCup.getLon(); + String lat = worldCup.getLat(); + Map<String, String> geocode = null; + try { + geocode = gdMapGeocodingUtil.geocode(lon, lat); + } catch (Exception e) { + throw new RuntimeException(e); + } + String province = geocode.get("province"); + String provinceCode = geocode.get("provinceCode"); + String city = geocode.get("city"); + String cityCode = geocode.get("cityCode"); + worldCup.setProvince(province.replace("省", "")); + worldCup.setProvinceCode(provinceCode); + worldCup.setCity(city.replace("市", "")); + worldCup.setCityCode(cityCode); + worldCupService.save(worldCup); + return worldCup.getId(); + } + + + /** + * 添加社区世界杯和门店关系数据 + * @param worldCupStore + */ + @ResponseBody + @PostMapping("/worldCup/addWorldCupStore") + public void addWorldCupStore(@RequestBody WorldCupStore worldCupStore){ + worldCupStoreService.save(worldCupStore); + } + + + + /** + * 编辑社区世界杯 + * @param worldCup + * @return + */ + @ResponseBody + @PostMapping("/worldCup/editWorldCup") + public Integer editWorldCup(@RequestBody WorldCup worldCup){ + String lon = worldCup.getLon(); + String lat = worldCup.getLat(); + Map<String, String> geocode = null; + try { + geocode = gdMapGeocodingUtil.geocode(lon, lat); + } catch (Exception e) { + throw new RuntimeException(e); + } + String province = geocode.get("province"); + String provinceCode = geocode.get("provinceCode"); + String city = geocode.get("city"); + String cityCode = geocode.get("cityCode"); + worldCup.setProvince(province.replace("省", "")); + worldCup.setProvinceCode(provinceCode); + worldCup.setCity(city.replace("市", "")); + worldCup.setCityCode(cityCode); + worldCupService.updateById(worldCup); + return worldCup.getId(); + } + + + /** + * 删除世界杯门店关系数据 + * @param worldCupId + */ + @ResponseBody + @PostMapping("/worldCup/delWorldCupStore") + public void delWorldCupStore(@RequestBody Integer worldCupId){ + worldCupStoreService.remove(new QueryWrapper<WorldCupStore>().eq("worldCupId", worldCupId)); + } + + + /** + * 根据id获取世界杯赛事数据 + * @param id + * @return + */ + @ResponseBody + @PostMapping("/worldCup/getWorldCupById") + public WorldCup getWorldCupById(@RequestBody Integer id){ + return worldCupService.getById(id); + } + + + /** + * 根据世界杯id获取门店关系数据 + * @param worldCupId + * @return + */ + @ResponseBody + @PostMapping("/worldCup/getWorldCupStoreAllList") + public List<WorldCupStore> getWorldCupStoreAllList(@RequestBody Integer worldCupId){ + return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("worldCupId", worldCupId)); + } + + + /** + * 取消赛事退款操作 + * @param id + */ + @ResponseBody + @PostMapping("/worldCup/cancelWorldCupRefund") + public void cancelWorldCupRefund(@RequestBody Integer id){ + worldCupService.cancelWorldCupRefund(id); + } } -- Gitblit v1.7.1