From a89221efd99beffa3f295b1a5c427e1ea0537bad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 09:31:38 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 132 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 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 d21a8ce..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
@@ -22,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;
@@ -88,6 +89,9 @@
@Autowired
private IWorldCupCompetitorService worldCupCompetitorService;
+
+ @Autowired
+ private GDMapGeocodingUtil gdMapGeocodingUtil;
@@ -184,7 +188,7 @@
@ApiImplicitParam(name = "code", value = "扫码结果", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<Map<String, String>> getDeviceInformation(String code){
+ public ResultUtil<Map<String, String>> getDeviceInformation(@RequestBody String code){
/**
* {
* "scan_type": 0, // 扫码类型：1000：游戏，1001:课程，1002:场地
@@ -264,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(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);
}
@@ -384,7 +390,7 @@
* @return
*/
@PostMapping("/worldCup/getWorldCupStoreList")
- public List<WorldCupStore> getWorldCupStoreList(Integer storeId){
+ 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));
@@ -502,8 +508,124 @@
*/
@ResponseBody
@PostMapping("/worldCup/winCount")
- public Integer winCount(Integer studentId){
+ 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