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 | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 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 c3e57b5..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;
@@ -518,6 +522,22 @@
@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();
}
@@ -543,7 +563,23 @@
@ResponseBody
@PostMapping("/worldCup/editWorldCup")
public Integer editWorldCup(@RequestBody WorldCup worldCup){
- worldCupService.save(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();
}
@@ -581,4 +617,15 @@
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