From f4894c44735012e51b7f3ade126b5bf9d7757202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 311 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 285 insertions(+), 26 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..ccec4d5 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
@@ -1,6 +1,7 @@
package com.dsh.communityWorldCup.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.communityWorldCup.entity.*;
@@ -10,10 +11,12 @@
import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient;
import com.dsh.communityWorldCup.feignclient.competition.model.Participant;
+import com.dsh.communityWorldCup.feignclient.other.GameClient;
import com.dsh.communityWorldCup.feignclient.other.SiteClient;
import com.dsh.communityWorldCup.feignclient.other.StoreClient;
import com.dsh.communityWorldCup.feignclient.other.model.Site;
import com.dsh.communityWorldCup.feignclient.other.model.Store;
+import com.dsh.communityWorldCup.feignclient.other.model.TGame;
import com.dsh.communityWorldCup.model.*;
import com.dsh.communityWorldCup.service.*;
import com.dsh.communityWorldCup.util.GDMapGeocodingUtil;
@@ -26,7 +29,9 @@
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -91,6 +96,82 @@
@Autowired
private IWorldCupPaymentService worldCupPaymentService;
+ @Resource
+ private GameClient gameClient;
+
+
+ /**
+ * 查询社区世界杯收入--管理后台
+ * @param storeId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getWorldCupIncome")
+ public List<WorldCupIncomeVO> getWorldCupIncome(@RequestBody WorldCupQuery query){
+ String STime = null;
+ String ETime = null;
+ if (StringUtils.hasLength(query.getTime())) {
+ STime = query.getTime().split(" - ")[0] + " 00:00:00";
+ ETime = query.getTime().split(" - ")[1] + " 23:59:59";
+ }
+
+ QueryWrapper<WorldCupPayment> in = new QueryWrapper<WorldCupPayment>()
+ .eq("payStatus", 2)
+ ;
+ if (STime != null){
+ in.between("payTime", STime, ETime);
+ }
+ if (query.getUserIds() != null){
+ if (!query.getUserIds().isEmpty()){
+ in.in("appUserId", query.getUserIds());
+ }
+ }
+
+ if (query.getAmount() != null){
+ in.le("amount", query.getAmount().toString());
+ }
+ List<WorldCupPayment> list = worldCupPaymentService.list(in);
+ List<WorldCupIncomeVO> res = new ArrayList<>();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ for (WorldCupPayment worldCupPayment : list) {
+ if (worldCupPayment.getPayType() == 0){
+ // 不计算免费的
+ continue;
+ }
+ WorldCupIncomeVO worldCupIncomeVO = new WorldCupIncomeVO();
+ WorldCup byId = worldCupService.getById(worldCupPayment.getWorldCupId());
+ if (byId!=null){
+ worldCupIncomeVO.setProvince(byId.getProvince());
+ worldCupIncomeVO.setCity(byId.getCity());
+ List<WorldCupStore> worldCupId = worldCupStoreService.list(new QueryWrapper<WorldCupStore>()
+ .eq("worldCupId", byId.getId()));
+ StringBuilder temp = new StringBuilder();
+ for (WorldCupStore worldCupStore : worldCupId) {
+ Store store = storeClient.queryStoreById(worldCupStore.getStoreId());
+ if (store!=null){
+ temp.append(store.getName()).append(",");
+ }
+ }
+ if (temp.length() > 0){
+ worldCupIncomeVO.setStoreName(temp.substring(0, temp.length() - 1));
+ }
+ }
+ AppUser appUser = appUserClient.getAppUser(worldCupPayment.getAppUserId());
+ worldCupIncomeVO.setId(worldCupPayment.getId().toString());
+ if (appUser!=null){
+ worldCupIncomeVO.setUserName(appUser.getName());
+ worldCupIncomeVO.setPhone(appUser.getPhone());
+ }
+ if (worldCupPayment.getPayTime()!=null){
+ String format = simpleDateFormat.format(worldCupPayment.getPayTime());
+ worldCupIncomeVO.setPayTime(format);
+ }
+ worldCupIncomeVO.setAmount(worldCupPayment.getAmount().toString());
+ res.add(worldCupIncomeVO);
+ }
+ return res;
+ }
+
/**
* 根据门店id获取门店关系数据
* @param storeId
@@ -98,10 +179,37 @@
*/
@ResponseBody
@PostMapping("/worldCup/getWorldCupStoreListByStoreId")
- public List<WorldCupStore> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
- return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId));
+ public List<WorldCupStoreVO> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
+ List<WorldCupStoreVO> res = new ArrayList<>();
+ List<WorldCupStore> storeId1 = worldCupStoreService.list(
+ new QueryWrapper<WorldCupStore>()
+ .eq("storeId", storeId));
+ for (WorldCupStore worldCupStore : storeId1) {
+ WorldCupStoreVO worldCupStoreVO = new WorldCupStoreVO();
+ BeanUtils.copyProperties(worldCupStore,worldCupStoreVO);
+ // 查询世界杯活动名称
+ WorldCup byId = worldCupService.getById(worldCupStore.getWorldCupId());
+ if (byId==null){
+ continue;
+ }
+ if (byId.getStatus()==3 || byId.getStatus()==4){
+ continue;
+ }
+ worldCupStoreVO.setName(byId.getName());
+ res.add(worldCupStoreVO);
+ }
+ return res;
}
-
+ /**
+ * 根据门店id修改门店关系数据
+ * @param worldCupStores
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/updateWorldCupStoreListById")
+ public Boolean updateWorldCupStoreListById(@RequestBody List<WorldCupStore> worldCupStores){
+ return worldCupStoreService.updateBatchById(worldCupStores);
+ }
@ResponseBody
@PostMapping("/api/worldCup/getWorldCupStore")
@@ -168,7 +276,7 @@
.eq("worldCupId", worldCupPeople.getWorldCupId()).eq("participantId", id).eq("participantType", isStudent)
.orderByDesc("createTime").last(" limit 0, 1"));
if(null == worldCupPaymentParticipant){
- return ResultUtil.error("无效二维码");
+ return ResultUtil.error("报名失败，当前用户未报名当前比赛");
}
WorldCupPeopleVo worldCupPeopleVo = new WorldCupPeopleVo();
worldCupPeopleVo.setId(worldCupPaymentParticipant.getParticipantId());
@@ -186,7 +294,7 @@
Participant participant = participantClient.getParticipant(worldCupPaymentParticipant.getParticipantId());
worldCupPeopleVo.setName(participant.getName());
worldCupPeopleVo.setAge(null == participant.getBirthday() ? 0 : Integer.valueOf(sdf.format(new Date())) -Integer.valueOf(sdf.format(participant.getBirthday())));
- worldCupPeopleVo.setAvatar(appUser.getHeadImg());
+ worldCupPeopleVo.setAvatar(participant.getHeadImg());
worldCupPeopleVo.setParticipantType(2);
}
return ResultUtil.success(worldCupPeopleVo);
@@ -215,13 +323,19 @@
return ResultUtil.error("二维码不正确");
}
Integer space_id = jsonObject.getInteger("space_id");
- Store store = storeClient.queryStoreById(space_id);
- if(null == store){
+ Site site = siteClient.getSite(space_id);
+ if(null == site){
return ResultUtil.error("无法获取场地信息");
+ }
+ Store store = storeClient.queryStoreById(site.getStoreId());
+ String sutu_id = jsonObject.getString("sutu_id");
+ TGame tGame = gameClient.getTGameBySutuId(sutu_id);
+ if(null == tGame){
+ return ResultUtil.error("无效的游戏二维码");
}
Map<String, String> map = new HashMap<>();
map.put("name", store.getName());
- map.put("address", store.getAddress());
+ map.put("address", site.getName());
return ResultUtil.success(map);
}
@@ -376,11 +490,10 @@
if(null != map){
String code = map.get("out_trade_no");
String transaction_id = map.get("trade_no");
- String result = map.get("result");
ResultUtil resultUtil = worldCupService.paymentWorldCupCallback(code, transaction_id);
if(resultUtil.getCode() == 200){
PrintWriter out = response.getWriter();
- out.println(result);
+ out.println("success");
out.flush();
out.close();
}else{
@@ -404,7 +517,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));
}
@@ -473,12 +590,12 @@
@PostMapping("/api/worldCup/getMyWorldCupInfo")
@ApiOperation(value = "获取已报名世界杯详情【2.0】", tags = {"APP-个人中心"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "Long"),
@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<MyWorldCupInfo> getMyWorldCupInfo(String id, String lon, String lat){
+ public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(Long id, String lon, String lat){
MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id, lon, lat);
return ResultUtil.success(myWorldCupInfo);
}
@@ -487,10 +604,10 @@
@PostMapping("/api/worldCup/cancelMyWorldCup")
@ApiOperation(value = "取消已报名的世界杯【2.0】", tags = {"APP-个人中心"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "Long"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil cancelMyWorldCup(String id){
+ public ResultUtil cancelMyWorldCup(Long id){
return worldCupPaymentService.cancelMyWorldCup(id);
}
@@ -567,6 +684,67 @@
public Map<String, Object> getWorldCupListAll(@RequestBody WorldCupListAll worldCupListAll){
return worldCupService.getWorldCupListAll(worldCupListAll);
}
+ /**
+ * 根据门店ids 获取归属学员
+ * @param storeIds
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getStudentIds")
+ public List<Integer> getStudentIds(@RequestBody StoreIds storeIds){
+ List<Integer> res = new ArrayList<>();
+
+ // 获取门店ids 所举办的世界杯ids 查询学员参赛
+ List<Integer> collect = worldCupStoreService.list(new QueryWrapper<WorldCupStore>()
+ .in("storeId", storeIds.getStoreIds())).stream()
+ .map(WorldCupStore::getWorldCupId).collect(Collectors.toList());
+ List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>()
+ .in("worldCupId", collect)
+ .eq("payStatus", 2));
+ for (WorldCupPayment worldCupPayment : list) {
+ JSONArray jsonArray = JSON.parseArray(worldCupPayment.getEntrant());
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ Integer isStudent = jsonObject.getInteger("isStudent");
+ if (isStudent!=1){
+ continue;
+ }
+ Long id = jsonObject.getLong("id");
+ String string = id.toString();
+ res.add(Integer.parseInt(string));
+ }
+ }
+ List<Long> collect1 = worldCupCompetitorService.list(new QueryWrapper<WorldCupCompetitor>()
+ .in("worldCupId", collect)
+ .eq("participantType", 1)).stream()
+ .map(WorldCupCompetitor::getParticipantId).collect(Collectors.toList());
+ // 将collect1中的数据全部转化为Integer类型
+ List<Integer> temp = new ArrayList<>();
+ temp = collect1.stream().map(Long::intValue).collect(Collectors.toList());
+ res.addAll(temp);
+ return res;
+ }
+ /**
+ * 根据门店ids 获取归属用户
+ * @param storeIds
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getUserIds")
+ public List<Integer> getUserIds(@RequestBody StoreIds storeIds){
+ List<Integer> res = new ArrayList<>();
+ // 获取门店ids 所举办的世界杯ids 查询用户
+ List<Integer> collect = worldCupStoreService.list(new QueryWrapper<WorldCupStore>()
+ .in("storeId", storeIds.getStoreIds())).stream()
+ .map(WorldCupStore::getWorldCupId).collect(Collectors.toList());
+ List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>()
+ .in("worldCupId", collect)
+ .eq("payStatus", 2));
+ for (WorldCupPayment worldCupPayment : list) {
+ res.add(worldCupPayment.getAppUserId());
+ }
+ return res;
+ }
@@ -594,6 +772,22 @@
worldCup.setProvinceCode(provinceCode);
worldCup.setCity(city.replace("市", ""));
worldCup.setCityCode(cityCode);
+ String[] split = worldCup.getPayType().split(",");
+ List<String> strings = Arrays.asList(split);
+ if(strings.contains("0")){
+ worldCup.setCash(null);
+ worldCup.setClassHour(null);
+ worldCup.setPaiCoin(null);
+ }
+ if(!strings.contains("1")){
+ worldCup.setCash(null);
+ }
+ if(!strings.contains("2")){
+ worldCup.setPaiCoin(null);
+ }
+ if(!strings.contains("3")){
+ worldCup.setClassHour(null);
+ }
worldCupService.save(worldCup);
return worldCup.getId();
}
@@ -618,9 +812,10 @@
*/
@ResponseBody
@PostMapping("/worldCup/editWorldCup")
- public Integer editWorldCup(@RequestBody WorldCup worldCup){
- String lon = worldCup.getLon();
- String lat = worldCup.getLat();
+ public Integer editWorldCup(@RequestBody String worldCup){
+ WorldCup worldCup2 = JSON.parseObject(worldCup, WorldCup.class);
+ String lon = worldCup2.getLon();
+ String lat = worldCup2.getLat();
Map<String, String> geocode = null;
try {
geocode = gdMapGeocodingUtil.geocode(lon, lat);
@@ -631,12 +826,31 @@
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();
+ worldCup2.setProvince(province.replace("省", ""));
+ worldCup2.setProvinceCode(provinceCode);
+ worldCup2.setCity(city.replace("市", ""));
+ worldCup2.setCityCode(cityCode);
+ WorldCup worldCup1 = worldCupService.getById(worldCup2.getId());
+ worldCup2.setCreateTime(worldCup1.getCreateTime());
+ worldCup2.setMatchNumber(worldCup1.getMatchNumber());
+ String[] split = worldCup2.getPayType().split(",");
+ List<String> strings = Arrays.asList(split);
+ if(strings.contains("0")){
+ worldCup2.setCash(null);
+ worldCup2.setClassHour(null);
+ worldCup2.setPaiCoin(null);
+ }
+ if(!strings.contains("1")){
+ worldCup2.setCash(null);
+ }
+ if(!strings.contains("2")){
+ worldCup2.setPaiCoin(null);
+ }
+ if(!strings.contains("3")){
+ worldCup2.setClassHour(null);
+ }
+ worldCupService.updateWorldCupAll(worldCup2);
+ return worldCup2.getId();
}
@@ -691,8 +905,9 @@
*/
@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){
+ log.warn("世界杯游戏成绩回调：custom->" + custom + ",red_score->" + red_score + ",blue_score->" + blue_score);
+ worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue_score);
}
@@ -713,6 +928,7 @@
worldCupPayment.setRefundOrderNo(refund_id);
worldCupPayment.setRefundTime(new Date());
worldCupPayment.setPayStatus(3);
+ worldCupPayment.setWorldCupId(null);
worldCupPaymentService.updateById(worldCupPayment);
PrintWriter out = null;
try {
@@ -797,6 +1013,14 @@
}
+ @ResponseBody
+ @PostMapping("/worldCup/getUserGameRecordList")
+ public Map<String, Object> getUserGameRecordList(@RequestBody WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
+ return worldCupPaymentParticipantService.getUserGameRecordList(worldCupGameStatisticsInfoList);
+ }
+
+
+
/**
* 获取用户比赛记录明细
* @param userGameRecordList
@@ -807,4 +1031,39 @@
public Map<String, Object> userGameRecordList(@RequestBody UserGameRecordList userGameRecordList){
return worldCupCompetitorService.userGameRecordList(userGameRecordList);
}
+
+
+ /**
+ * 获取已报名人数
+ * @param worldCupId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getRegisteredNumber")
+ public int getRegisteredNumber(@RequestBody Integer worldCupId){
+ List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", worldCupId)
+ .eq("payStatus", 2).eq("state", 1));
+ List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
+ if(collect.size() == 0){
+ return 0;
+ }
+ return worldCupPaymentParticipantService.getCount(worldCupId, collect);
+ }
+
+
+ /**
+ * 获取支付记录
+ * @param getWorldCupPayment
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getWorldCupPayment")
+ public List<WorldCupPayment> getWorldCupPayment(@RequestBody GetWorldCupPayment getWorldCupPayment){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String payType = getWorldCupPayment.getPayType();
+ List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("appUserId", getWorldCupPayment.getAppUserId())
+ .in("payType", Arrays.asList(payType.split(","))).ne("payStatus", 1).eq("state", 1)
+ .last(" and createTime between '" + sdf.format(getWorldCupPayment.getStartTime()) + "' and '" + sdf.format(getWorldCupPayment.getEndTime()) + "' order by createTime desc"));
+ return list;
+ }
}
--
Gitblit v1.7.1