From 0547707e29364a36df05c5afcddd37f30702421e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 13 三月 2024 14:31:58 +0800
Subject: [PATCH] bug修改
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 79 insertions(+), 10 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 8281e5b..1cbcdaf 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
@@ -26,6 +26,7 @@
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.web.bind.annotation.*;
@@ -98,10 +99,30 @@
*/
@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());
+ 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")
@@ -171,11 +192,11 @@
return ResultUtil.error("无效二维码");
}
WorldCupPeopleVo worldCupPeopleVo = new WorldCupPeopleVo();
- worldCupPeopleVo.setId(worldCupPaymentParticipant.getId());
+ worldCupPeopleVo.setId(worldCupPaymentParticipant.getParticipantId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
if(worldCupPaymentParticipant.getParticipantType() == 1){
//学员
- TStudent tStudent = studentClient.queryById(worldCupPaymentParticipant.getParticipantId());
+ TStudent tStudent = studentClient.queryById(worldCupPaymentParticipant.getParticipantId().intValue());
worldCupPeopleVo.setName(tStudent.getName());
worldCupPeopleVo.setAge(null == tStudent.getBirthday() ? 0 : Integer.valueOf(sdf.format(new Date())) -Integer.valueOf(sdf.format(tStudent.getBirthday())));
worldCupPeopleVo.setAvatar(tStudent.getHeadImg());
@@ -186,7 +207,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);
@@ -404,7 +425,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 +660,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 +719,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 +825,14 @@
}
+ @ResponseBody
+ @PostMapping("/worldCup/getUserGameRecordList")
+ public Map<String, Object> getUserGameRecordList(@RequestBody WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
+ return worldCupPaymentParticipantService.getUserGameRecordList(worldCupGameStatisticsInfoList);
+ }
+
+
+
/**
* 获取用户比赛记录明细
* @param userGameRecordList
@@ -807,4 +843,37 @@
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");
+ return worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("appUserId", getWorldCupPayment.getAppUserId())
+ .eq("payType", getWorldCupPayment.getPayType()).ne("payStatus", 1).eq("state", 1)
+ .last(" and createTime between '" + sdf.format(getWorldCupPayment.getStartTime()) + "' and '" + sdf.format(getWorldCupPayment.getEndTime()) + "' order by createTime desc"));
+ }
}
--
Gitblit v1.7.1