From a12b0be844b87f9a11573f4807a256307a9c4bb1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 18:24:50 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 9c71445..dfb6c24 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
@@ -132,6 +132,9 @@
String people = startWorldCup.getPeople();
JSONArray jsonArray = JSON.parseArray(people);
+ if(jsonArray.size() != 6){
+ return ResultUtil.error("参赛人数只能是6人");
+ }
String timeStr = UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3);
List<Long> ids = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@@ -165,6 +168,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");
@@ -249,7 +255,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());
}
});
}
@@ -397,7 +403,7 @@
if(ids.size() > 0){
int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
.eq("worldCupPaymentId", ids));
- if((count + jsonArray.size()) >= worldCup.getMatchNumber()){
+ if((count + jsonArray.size()) >= worldCup.getMaxPeople()){
return ResultUtil.error("已超出最大报名人数");
}
}
@@ -516,6 +522,7 @@
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - multiply.intValue());
appUserClient.updateAppUser(appUser);
+ //
//添加报名明细
String ids = paymentWorldCup.getIds();
@@ -737,6 +744,7 @@
BigDecimal multiply = worldCupPayment.getUnitPrice().multiply(new BigDecimal(list1.size()));
//免费
if(worldCupPayment.getPayType() == 0){
+ worldCupPayment.setWorldCupId(null);
worldCupPayment.setRefundOrderNo("");
worldCupPayment.setRefundTime(new Date());
worldCupPayment.setPayStatus(3);
@@ -761,6 +769,7 @@
}
if("10000".equals(map.get("code"))){
String trade_no = map.get("trade_no");
+ worldCupPayment.setWorldCupId(null);
worldCupPayment.setRefundTime(new Date());
worldCupPayment.setRefundOrderNo(trade_no);
worldCupPayment.setPayStatus(3);
@@ -773,6 +782,7 @@
AppUser appUser = appUserClient.getAppUser(appUserId);
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() + multiply.intValue());
appUserClient.updateAppUser(appUser);
+ worldCupPayment.setWorldCupId(null);
worldCupPayment.setRefundTime(new Date());
worldCupPayment.setRefundOrderNo("");
worldCupPayment.setPayStatus(3);
@@ -785,6 +795,7 @@
DeductionClassHourList deductionClassHourList = JSON.parseObject(content, DeductionClassHourList.class);
coursePackageOrderStudentClient.backspaceClassHour(deductionClassHourList);
}
+ worldCupPayment.setWorldCupId(null);
worldCupPayment.setRefundTime(new Date());
worldCupPayment.setRefundOrderNo("");
worldCupPayment.setPayStatus(3);
@@ -827,7 +838,7 @@
List<Map<String, Object>> mapList = this.baseMapper.worldCupGameStatistics(worldCupGameStatistics);
for (Map<String, Object> stringObjectMap : mapList) {
Integer id = Integer.valueOf(stringObjectMap.get("id").toString());
- int count = worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>().eq("worldCupId", id));
+ int count = worldCupCompetitorService.getMatchTime(id);
stringObjectMap.put("matchTime", count);
List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id)
--
Gitblit v1.7.1