From b28d69f6cba1a7aed03fd9c07a14693281f9a9a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:16:22 +0800
Subject: [PATCH] 修改bug
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index a5cce66..1348a56 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -9,7 +9,9 @@
import com.dsh.communityWorldCup.entity.*;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
import com.dsh.communityWorldCup.feignclient.account.StudentClient;
+import com.dsh.communityWorldCup.feignclient.account.UserIntegralChangesClient;
import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
+import com.dsh.communityWorldCup.feignclient.account.model.SaveUserIntegralChangesVo;
import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient;
import com.dsh.communityWorldCup.feignclient.competition.model.Participant;
@@ -72,6 +74,9 @@
@Resource
private GameClient gameClient;
+
+ @Resource
+ private UserIntegralChangesClient userIntegralChangesClient;
@@ -146,9 +151,12 @@
//添加参赛奖励
if(null != worldCup.getParticipationIntegral() && 0 < worldCup.getParticipationIntegral()){
worldCupCompetitor.setParticipationIntegral(worldCup.getParticipationIntegral());
- AppUser appUser = appUserClient.getAppUser(worldCupCompetitor.getAppUserId());
- appUser.setIntegral(appUser.getIntegral() + worldCup.getParticipationIntegral());
- appUserClient.updateAppUser(appUser);
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(worldCupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getParticipationIntegral());
+ vo.setType(6);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
}
worldCupCompetitorService.save(worldCupCompetitor);
@@ -157,6 +165,9 @@
// worldCupPaymentParticipant.setAlreadyEntered(1);
// worldCupPaymentParticipantService.updateById(worldCupPaymentParticipant);
}
+ worldCup.setMatchNumber(worldCup.getMatchNumber() + 1);
+ this.updateById(worldCup);
+
//2、调起开启游戏的接口。
HashMap<String, String> map = new HashMap<>();
map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
@@ -166,7 +177,7 @@
map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
map.put("custom", JSON.toJSONString(ids));
- String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/batterGame", map);
+ String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/quickStart", map);
JSONObject jsonObject = JSONObject.parseObject(s);
Integer code1 = jsonObject.getInteger("code");
String message = jsonObject.getString("message");
@@ -185,9 +196,17 @@
*/
@Override
public Integer getCompletedWorldCupTips(Integer uid) {
- int count = worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
- .eq("appUserId", uid).eq("tips", 0).isNotNull("endTime"));
- return count;
+ List<WorldCupCompetitor> list = worldCupCompetitorService.list(new QueryWrapper<WorldCupCompetitor>()
+ .eq("appUserId", uid).eq("tips", 0).isNotNull("endTime")
+ .orderByDesc("endTime").last(" limit 0, 1"));
+ list.forEach(v->{
+ v.setWorldCupId(null);
+ v.setTips(1);
+ });
+ if(list.size() > 0){
+ worldCupCompetitorService.updateBatchById(list);
+ }
+ return list.size();
}
@@ -233,7 +252,7 @@
Collections.sort(worldCupList1, new Comparator<WorldCupListVo>() {
@Override
public int compare(WorldCupListVo o1, WorldCupListVo o2) {
- return o1.getDistance().compareTo(o2.getDistance()) * -1;
+ return o1.getDistance().compareTo(o2.getDistance());
}
});
}
@@ -372,11 +391,26 @@
if(System.currentTimeMillis() > worldCup.getEndTime().getTime()){
return ResultUtil.error("世界杯赛事已结束，无法完成报名");
}
+
+ String cupIds = paymentWorldCup.getIds();
+ JSONArray jsonArray = JSON.parseArray(cupIds);
+ if(jsonArray.size() != 6){
+ return ResultUtil.error("参赛人数只能是6人");
+ }
+ List<WorldCupPayment> payments = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", worldCup.getId())
+ .eq("payStatus", 2).eq("state", 1));
+ List<Long> ids = payments.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
+ if(ids.size() > 0){
+ int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
+ .eq("worldCupPaymentId", ids));
+ if((count + jsonArray.size()) >= worldCup.getMaxPeople()){
+ return ResultUtil.error("已超出最大报名人数");
+ }
+ }
+
List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", worldCup.getId()).eq("appUserId", paymentWorldCup.getUid())
.eq("payStatus", 2).eq("state", 1));
List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
- String ids = paymentWorldCup.getIds();
- JSONArray jsonArray = JSON.parseArray(ids);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
@@ -385,6 +419,9 @@
Integer isStudent = jsonObject.getInteger("isStudent");
if(isStudent == 1){
TStudent tStudent = studentClient.queryById(id.intValue());
+ if(worldCup.getGender() != 0 && !tStudent.getSex().equals(worldCup.getGender())){
+ return ResultUtil.error("此比赛只能是" + (worldCup.getGender() == 1 ? "男" : "女") + "性参加");
+ }
if(collect.size() > 0){
WorldCupPaymentParticipant one = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
.eq("participantId", id).eq("participantType", isStudent == 0 ? 2 : 1).in("worldCupPaymentId", collect));
@@ -401,6 +438,9 @@
}
}else{
Participant participant = participantClient.getParticipant(id);
+ if(worldCup.getGender() != 0 && !participant.getGender().equals(worldCup.getGender())){
+ return ResultUtil.error("此比赛只能是" + (worldCup.getGender() == 1 ? "男" : "女") + "性参加");
+ }
if(collect.size() > 0){
WorldCupPaymentParticipant one = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
.eq("participantId", id).eq("participantType", isStudent == 0 ? 2 : 1).in("worldCupPaymentId", collect));
@@ -811,4 +851,13 @@
map.put("total", count);
return map;
}
+
+ /**
+ * 修改所有参数
+ * @param worldCup
+ */
+ @Override
+ public void updateWorldCupAll(WorldCup worldCup) {
+ this.baseMapper.updateWorldCupAll(worldCup);
+ }
}
--
Gitblit v1.7.1