From b23b243473fc9ab20ca62eebf3668c143e2e7d23 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 15:30:53 +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/WorldCupCompetitorServiceImpl.java | 563 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 504 insertions(+), 59 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
index 11c1a73..4177c3a 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -1,22 +1,26 @@
package com.dsh.communityWorldCup.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.communityWorldCup.entity.WorldCup;
import com.dsh.communityWorldCup.entity.WorldCupCompetitor;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
import com.dsh.communityWorldCup.feignclient.account.StudentClient;
-import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
-import com.dsh.communityWorldCup.feignclient.account.model.AppUserIdsByCityName;
-import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
+import com.dsh.communityWorldCup.feignclient.account.StudentHonorClient;
+import com.dsh.communityWorldCup.feignclient.account.UserIntegralChangesClient;
+import com.dsh.communityWorldCup.feignclient.account.model.*;
import com.dsh.communityWorldCup.feignclient.competition.ParticipantClient;
import com.dsh.communityWorldCup.feignclient.competition.model.Participant;
import com.dsh.communityWorldCup.feignclient.other.StoreClient;
import com.dsh.communityWorldCup.mapper.WorldCupCompetitorMapper;
+import com.dsh.communityWorldCup.mapper.WorldCupPaymentParticipantMapper;
import com.dsh.communityWorldCup.model.*;
import com.dsh.communityWorldCup.service.IWorldCupCompetitorService;
+import com.dsh.communityWorldCup.service.IWorldCupPaymentParticipantService;
import com.dsh.communityWorldCup.service.IWorldCupService;
+import com.dsh.communityWorldCup.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,6 +28,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -45,6 +50,12 @@
@Autowired
private IWorldCupService worldCupService;
+ @Resource
+ private UserIntegralChangesClient userIntegralChangesClient;
+
+ @Resource
+ private StudentHonorClient studentHonorClient;
+
@@ -63,7 +74,7 @@
entrantRankVo.setName(participant.getName());
}else{
//学员
- TStudent tStudent = studentClient.queryById(entrantRank.getId());
+ TStudent tStudent = studentClient.queryById(entrantRank.getId().intValue());
entrantRankVo.setName(tStudent.getName());
}
//全国排名---直接数据库分组查询后排序
@@ -72,7 +83,7 @@
for (int i = 0; i < mapList.size(); i++) {
Map<String, Object> map = mapList.get(i);
Integer participantType = Integer.valueOf(map.get("participantType").toString());
- Integer participantId = Integer.valueOf(map.get("participantId").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
Integer num = Integer.valueOf(map.get("num").toString());
if(null != participantId && participantId.equals(entrantRank.getId()) && participantType.equals(entrantRank.getIsStudent())){
entrantRankVo.setNationalRank(i + 1);
@@ -92,7 +103,7 @@
for (int i = 0; i < mapList1.size(); i++) {
Map<String, Object> map = mapList1.get(i);
Integer participantType = Integer.valueOf(map.get("participantType").toString());
- Integer participantId = Integer.valueOf(map.get("participantId").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
Integer num = Integer.valueOf(map.get("num").toString());
if(null != participantId && participantId.equals(entrantRank.getId()) && participantType.equals(entrantRank.getIsStudent())){
entrantRankVo.setCityRank(i + 1);
@@ -104,7 +115,7 @@
}else{
wrapper.eq("participantType", 1);
}
- int win = this.count(wrapper.eq("participantId", entrantRank.getId()).eq("matchResult", 1));
+ int win = this.count(wrapper.eq("participantId", entrantRank.getId()).in("matchResult", Arrays.asList(0, 1)));
entrantRankVo.setWin(win);
wrapper = new QueryWrapper<>();
@@ -136,7 +147,7 @@
matchRecord.setPageNo(pageNo);
MatchRecordVo matchRecordVo = new MatchRecordVo();
int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("participantId", matchRecord.getId())
- .eq("participantType", matchRecord.getIsStudent()));
+ .eq("participantType", matchRecord.getIsStudent()).isNotNull("matchResult"));
matchRecordVo.setTotalSession(count);
List<MatchRecordList> matchRecord1 = this.baseMapper.getMatchRecord(matchRecord);
matchRecordVo.setList(matchRecord1);
@@ -157,12 +168,66 @@
AppUser appUser = appUserClient.getAppUser(worldCupRank.getAppUserId());
appUserIds = appUserClient.getAppUserIds(appUser.getCityCode());
}
+ //总场次
List<Map<String, Object>> lists = this.baseMapper.getWorldCupRank(worldCupRank, appUserIds);
- List<WorldCupRankVo> list = new ArrayList<>();
+ //未负的数据
+ List<Map<String, Object>> lists1 = this.baseMapper.getWorldCupRank1(worldCupRank, appUserIds);
+ List<Map<String, Object>> mapList = new ArrayList<>();
for (int i = 0; i < lists.size(); i++) {
Map<String, Object> map = lists.get(i);
Integer participantType = Integer.valueOf(map.get("participantType").toString());
- Integer participantId = Integer.valueOf(map.get("participantId").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
+ Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
+ Integer num = Integer.valueOf(null == map.get("num") ? "0" : map.get("num").toString());
+ //学员
+ if(participantType == 1){
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if(tStudent.getState() != 1){
+ continue;
+ }
+ }
+ //参赛人员
+ if(participantType == 2){
+ Participant participant = participantClient.getParticipant(participantId);
+ if(participant.getState() != 1){
+ continue;
+ }
+ }
+ map.put("totalSession", num);
+ map.put("winRate", "0");
+ for (Map<String, Object> objectMap : lists1) {
+ Integer participantType1 = Integer.valueOf(objectMap.get("participantType").toString());
+ Long participantId1 = Long.valueOf(objectMap.get("participantId").toString());
+ Integer appUserId1 = Integer.valueOf(objectMap.get("appUserId").toString());
+ Integer num1 = Integer.valueOf(null == objectMap.get("num") ? "0" : objectMap.get("num").toString());
+ if(participantType.compareTo(participantType1) == 0 && participantId.compareTo(participantId1) == 0 && appUserId.compareTo(appUserId1) == 0){
+ map.put("winRate", new BigDecimal(num1).divide(new BigDecimal(num), new MathContext(4, RoundingMode.HALF_EVEN)).multiply(new BigDecimal(100)).doubleValue());
+ break;
+ }
+ }
+ mapList.add(map);
+ }
+ if(worldCupRank.getSort() == 1){
+ mapList.sort(new Comparator<Map<String, Object>>() {
+ @Override
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return Double.valueOf(o1.get("totalSession").toString()).compareTo(Double.valueOf(o2.get("totalSession").toString())) * -1;
+ }
+ });
+ }
+ if(worldCupRank.getSort() == 2){
+ mapList.sort(new Comparator<Map<String, Object>>() {
+ @Override
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return Double.valueOf(o1.get("winRate").toString()).compareTo(Double.valueOf(o2.get("winRate").toString())) * -1;
+ }
+ });
+ }
+ List<WorldCupRankVo> list = new ArrayList<>();
+ for (int i = 0; i < mapList.size(); i++) {
+ Map<String, Object> map = mapList.get(i);
+ Integer participantType = Integer.valueOf(map.get("participantType").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
Integer totalSession = Integer.valueOf(map.get("totalSession").toString());
Double winRate = Double.valueOf(map.get("winRate").toString());
@@ -170,11 +235,12 @@
boolean b = false;
if(i <= 19){
WorldCupRankVo worldCupRankVo = new WorldCupRankVo();
+ worldCupRankVo.setRank(i + 1);
worldCupRankVo.setTotalSession(totalSession);
worldCupRankVo.setWinRate(winRate);
//学员
if(participantType == 1){
- TStudent tStudent = studentClient.queryById(participantId);
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
worldCupRankVo.setAvatar(tStudent.getHeadImg());
String name = tStudent.getName();
if(name.length() > 2){
@@ -186,9 +252,8 @@
}
//参赛人员
if(participantType == 2){
- AppUser appUser1 = appUserClient.getAppUser(appUserId);
Participant participant = participantClient.getParticipant(participantId);
- worldCupRankVo.setAvatar(appUser1.getHeadImg());
+ worldCupRankVo.setAvatar(participant.getHeadImg());
String name = participant.getName();
if(name.length() > 2){
name = name.charAt(0) + "*" + name.substring(2);
@@ -198,7 +263,7 @@
worldCupRankVo.setName(name);
}
- if(worldCupRank.getIsStudent().equals(participantType) && worldCupRank.getId().equals(participantId)){
+ if(worldCupRank.getIsStudent().compareTo(participantType) == 0 && worldCupRank.getId().compareTo(participantId) == 0){
worldCupRankVo.setOneself(1);
b = true;
}else{
@@ -213,13 +278,14 @@
}
//排名前20的数据添加完成后且包含自己，需要将自己找出来后添加到21位
if(i > 19 && !b){
- if(worldCupRank.getIsStudent().equals(participantType) && worldCupRank.getId().equals(participantId)){
+ if(worldCupRank.getIsStudent().compareTo(participantType) == 0 && worldCupRank.getId().compareTo(participantId) == 0){
WorldCupRankVo worldCupRankVo = new WorldCupRankVo();
+ worldCupRankVo.setRank(i + 1);
worldCupRankVo.setTotalSession(totalSession);
worldCupRankVo.setWinRate(winRate);
//学员
if(participantType == 1){
- TStudent tStudent = studentClient.queryById(participantId);
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
worldCupRankVo.setAvatar(tStudent.getHeadImg());
String name = tStudent.getName();
if(name.length() > 2){
@@ -231,9 +297,8 @@
}
//参赛人员
if(participantType == 2){
- AppUser appUser1 = appUserClient.getAppUser(appUserId);
Participant participant = participantClient.getParticipant(participantId);
- worldCupRankVo.setAvatar(appUser1.getHeadImg());
+ worldCupRankVo.setAvatar(participant.getHeadImg());
String name = participant.getName();
if(name.length() > 2){
name = name.charAt(0) + "*" + name.substring(2);
@@ -257,46 +322,85 @@
* 比赛结束后通知处理逻辑
* @param custom 开始比赛接口上传的自定义参数
* @param red_score 红方分数
- * @param blue 蓝方分数
+ * @param blue_score 蓝方分数
*/
@Override
- public void endWorldCupCallback(String custom, Integer red_score, Integer blue) {
- List<Long> ids = JSON.parseArray(custom, Long.class);
+ public void endWorldCupCallback(String custom, Integer red_score, Integer blue_score) {
+ JSONObject jsonObject = JSON.parseObject(custom);
+ Integer gameType = jsonObject.getInteger("gameType");
+ //智慧球场比赛
+ if(2 == gameType){
+ return;
+ }
+ List<Long> ids = jsonObject.getJSONArray("ids").toJavaList(Long.class);
List<WorldCupCompetitor> worldCupCompetitors = this.listByIds(ids);
- WorldCupCompetitor worldCupCompetitor1 = worldCupCompetitors.get(0);
- WorldCup worldCup = worldCupService.getById(worldCupCompetitor1.getWorldCupId());
- for (WorldCupCompetitor worldCupCompetitor : worldCupCompetitors) {
- //蓝方
- if(worldCupCompetitor.getParticipant() == 1){
- worldCupCompetitor.setMatchResult(blue.compareTo(red_score));
- worldCupCompetitor.setOurScore(blue);
- worldCupCompetitor.setOpponentScore(red_score);
- worldCupCompetitor.setEndTime(new Date());
- worldCupCompetitor.setWinIntegral(0);
- if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && blue.compareTo(red_score) >= 0){
- worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
- AppUser appUser = appUserClient.getAppUser(worldCupCompetitor.getAppUserId());
- appUser.setIntegral(appUser.getIntegral() + worldCup.getWinIntegral());
- appUserClient.updateAppUser(appUser);
+ try {
+ WorldCupCompetitor worldCupCompetitor1 = worldCupCompetitors.get(0);
+ WorldCup worldCup = worldCupService.getById(worldCupCompetitor1.getWorldCupId());
+ for (WorldCupCompetitor worldCupCompetitor : worldCupCompetitors) {
+ worldCupCompetitor.setWorldCupId(null);
+ //蓝方
+ if(worldCupCompetitor.getParticipant() == 1){
+ worldCupCompetitor.setMatchResult(blue_score.compareTo(red_score));
+ worldCupCompetitor.setOurScore(blue_score);
+ worldCupCompetitor.setOpponentScore(red_score);
+ worldCupCompetitor.setEndTime(new Date());
+ worldCupCompetitor.setWinIntegral(0);
+ if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && blue_score.compareTo(red_score) >= 0){
+ worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(worldCupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral());
+ vo.setType(7);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+ }
+ }
+ //红方
+ if(worldCupCompetitor.getParticipant() == 2){
+ worldCupCompetitor.setMatchResult(red_score.compareTo(blue_score));
+ worldCupCompetitor.setOurScore(red_score);
+ worldCupCompetitor.setOpponentScore(blue_score);
+ worldCupCompetitor.setEndTime(new Date());
+ worldCupCompetitor.setWinIntegral(0);
+ if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && red_score.compareTo(blue_score) >= 0){
+ worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(worldCupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral());
+ vo.setType(7);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+ }
}
}
- //红方
- if(worldCupCompetitor.getParticipant() == 2){
- worldCupCompetitor.setMatchResult(red_score.compareTo(blue));
- worldCupCompetitor.setOurScore(red_score);
- worldCupCompetitor.setOpponentScore(blue);
- worldCupCompetitor.setEndTime(new Date());
- worldCupCompetitor.setWinIntegral(0);
- if(null != worldCup.getWinIntegral() && 0 < worldCup.getWinIntegral() && red_score.compareTo(blue) >= 0){
- worldCupCompetitor.setWinIntegral(worldCup.getWinIntegral());
- AppUser appUser = appUserClient.getAppUser(worldCupCompetitor.getAppUserId());
- appUser.setIntegral(appUser.getIntegral() + worldCup.getWinIntegral());
- appUserClient.updateAppUser(appUser);
- }
- }
+ }catch (Exception e){
+ e.printStackTrace();
}
this.updateBatchById(worldCupCompetitors);
+
+ //添加勋章
+ for (WorldCupCompetitor worldCupCompetitor : worldCupCompetitors) {
+ Integer appUserId = worldCupCompetitor.getAppUserId();
+ //常胜将军
+ if(1 == worldCupCompetitor.getMatchResult()){
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId).eq("matchResult", 1));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(5);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+ //越战越勇
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(6);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+
}
@@ -313,33 +417,374 @@
appUserIdsByCityName.setCity(worldCupRecords.getCity());
List<Integer> appUserIds = appUserClient.getAppUserIdsByCityName(appUserIdsByCityName);
List<Map<String, Object>> mapList = this.baseMapper.worldCupRecordsList(worldCupRecords, appUserIds);
+ List<Map<String, Object>> mapList1 = this.baseMapper.worldCupRecordsList1(worldCupRecords, appUserIds);
+ List<Map<String, Object>> list = new ArrayList<>();
+ int row_num = 0;
for (int i = 0; i < mapList.size(); i++) {
Map<String, Object> map = mapList.get(i);
Integer participantType = Integer.valueOf(map.get("participantType").toString());
- Integer participantId = Integer.valueOf(map.get("participantId").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
+ Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
+ Integer num = Integer.valueOf(null == map.get("num") ? "0" : map.get("num").toString());
+ //学员
+ if(participantType == 1){
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if(tStudent.getState() != 1){
+ continue;
+ }
+ }
+ //参赛人员
+ if(participantType == 2){
+ Participant participant = participantClient.getParticipant(participantId);
+ if(participant.getState() != 1){
+ continue;
+ }
+ }
+ map.put("totalSession", num);
+ map.put("winRate", "0");
+ map.put("win", "0");
+ for (Map<String, Object> objectMap : mapList1) {
+ Integer participantType1 = Integer.valueOf(objectMap.get("participantType").toString());
+ Long participantId1 = Long.valueOf(objectMap.get("participantId").toString());
+ Integer appUserId1 = Integer.valueOf(objectMap.get("appUserId").toString());
+ Integer num1 = Integer.valueOf(null == objectMap.get("num") ? "0" : objectMap.get("num").toString());
+ if(participantType.compareTo(participantType1) == 0 && participantId.compareTo(participantId1) == 0 && appUserId.compareTo(appUserId1) == 0){
+ map.put("winRate", new BigDecimal(num1).divide(new BigDecimal(num), new MathContext(4, RoundingMode.HALF_EVEN)).multiply(new BigDecimal(100)).doubleValue());
+ map.put("win", num1);
+ break;
+ }
+ }
+ Integer win = Integer.valueOf(map.get("win").toString());
+ Integer lose = num - win;
+ map.put("lose", lose);
+ AppUser appUser = appUserClient.getAppUser(appUserId);
+ map.put("province", appUser.getProvince() + appUser.getCity());
+ if(1 == participantType){
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if(tStudent.getState() != 1){
+ continue;
+ }
+ map.put("name", tStudent.getName());
+ map.put("phone", ToolUtil.isNotEmpty(tStudent.getPhone()) ? tStudent.getPhone() : appUser.getPhone());
+ }else{
+ Participant participant = participantClient.getParticipant(participantId);
+ if(participant.getState() != 1){
+ continue;
+ }
+ map.put("name", participant.getName());
+ map.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
+ }
+ row_num++;
+ map.put("row_num", row_num);
+ list.add(map);
+ }
+ list.sort(new Comparator<Map<String, Object>>() {
+ @Override
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return Double.valueOf(o1.get("totalSession").toString()).compareTo(Double.valueOf(o2.get("totalSession").toString())) * -1;
+ }
+ });
+
+ Integer offset = worldCupRecords.getOffset();
+ Integer limit = worldCupRecords.getLimit();
+ limit += offset;
+ map1.put("rows", list.subList(offset, list.size() >= limit ? limit : list.size()));
+ map1.put("total", list.size());
+ return map1;
+ }
+
+
+ /**
+ * 获取比赛统计详情列表
+ * @param worldCupGameStatisticsInfoList
+ * @return
+ */
+ @Override
+ public Map<String, Object> worldCupGameStatisticsInfoList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList) {
+ Map<String, Object> map1 = new HashMap<>();
+ Integer id = worldCupGameStatisticsInfoList.getId();
+ String name = worldCupGameStatisticsInfoList.getName();
+ String phone = worldCupGameStatisticsInfoList.getPhone();
+ String idcard = worldCupGameStatisticsInfoList.getIdcard();
+ List<Map<String, Object>> mapList = this.baseMapper.worldCupGameStatisticsInfoList(id);
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (int i = 0; i < mapList.size(); i++) {
+ Map<String, Object> map = mapList.get(i);
+ Integer participantType = Integer.valueOf(map.get("participantType").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
Integer totalSession = Integer.valueOf(map.get("totalSession").toString());
Integer win = Integer.valueOf(map.get("win").toString());
Integer lose = totalSession - win;
map.put("lose", lose);
+ map.put("participantType", participantType);
+ map.put("participantId", participantId);
AppUser appUser = appUserClient.getAppUser(appUserId);
map.put("province", appUser.getProvince() + appUser.getCity());
if(1 == participantType){
- TStudent tStudent = studentClient.queryById(participantId);
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
+ continue;
+ }
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone()).indexOf(phone) == -1){
+ continue;
+ }
+ if(ToolUtil.isNotEmpty(idcard) && tStudent.getIdCard().indexOf(idcard) == -1){
+ continue;
+ }
+
map.put("name", tStudent.getName());
- map.put("phone", tStudent.getPhone());
+ map.put("phone", ToolUtil.isEmpty(tStudent.getPhone()) ? appUser.getPhone() : tStudent.getPhone());
+ map.put("idcard", tStudent.getIdCard());
}else{
Participant participant = participantClient.getParticipant(participantId);
+ if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
+ continue;
+ }
+ if(ToolUtil.isNotEmpty(phone) && (ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone()).indexOf(phone) == -1){
+ continue;
+ }
+ if(ToolUtil.isNotEmpty(idcard) && participant.getIdcard().indexOf(idcard) == -1){
+ continue;
+ }
+
map.put("name", participant.getName());
- map.put("phone", participant.getPhone());
+ map.put("phone", ToolUtil.isNotEmpty(participant.getPhone()) ? participant.getPhone() : appUser.getPhone());
+ map.put("idcard", participant.getIdcard());
}
+ list.add(map);
}
- Integer offset = worldCupRecords.getOffset();
- Integer limit = worldCupRecords.getLimit();
+ map1.put("total", list.size());
+ Integer offset = worldCupGameStatisticsInfoList.getOffset();
+ Integer limit = worldCupGameStatisticsInfoList.getLimit();
limit += offset;
- map1.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size()));
- int count = this.baseMapper.worldCupRecordsListCount(appUserIds);
- map1.put("total", count);
+ map1.put("rows", list.subList(offset, list.size() >= limit ? limit : list.size()));
return map1;
}
+
+
+ /**
+ * 获取单场参赛详情列表
+ * @return
+ */
+ @Override
+ public Map<String, Object> worldCupGameStatisticsListInfo(WorldCupGameStatisticsListInfo worldCupGameStatisticsListInfo) {
+ Long participantId = worldCupGameStatisticsListInfo.getParticipantId();
+ Integer participantType = worldCupGameStatisticsListInfo.getParticipantType();
+ String name = worldCupGameStatisticsListInfo.getName();
+ List<WorldCupCompetitor> list = this.list(new QueryWrapper<WorldCupCompetitor>()
+ .eq("participantType", participantType).eq("participantId", participantId)
+ .isNotNull("matchResult").orderByDesc("startTime"));
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.HH.dd HH:mm");
+ for (WorldCupCompetitor cupCompetitor : list) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", cupCompetitor.getId().toString());
+ if(1 == participantType){
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
+ continue;
+ }
+
+ map.put("name", tStudent.getName());
+ }else{
+ Participant participant = participantClient.getParticipant(participantId);
+ if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
+ continue;
+ }
+ map.put("name", participant.getName());
+ }
+ map.put("startTime", sdf.format(cupCompetitor.getStartTime()));
+ map.put("score", cupCompetitor.getOurScore() + ":" + cupCompetitor.getOpponentScore());
+ map.put("matchResult", cupCompetitor.getMatchResult() == 1 ? "胜" : cupCompetitor.getMatchResult() == 0 ? "平" : "负");
+ map.put("blue", cupCompetitor.getParticipant() == 1 ? cupCompetitor.getOurScore() : cupCompetitor.getOpponentScore());
+ map.put("red", cupCompetitor.getParticipant() == 2 ? cupCompetitor.getOurScore() : cupCompetitor.getOpponentScore());
+ mapList.add(map);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", mapList);
+ map.put("total", mapList.size());
+ return map;
+ }
+
+
+ /**
+ * 修改比分
+ * @param changeScore
+ */
+ @Override
+ public void changeScore(ChangeScore changeScore) {
+ Long id = changeScore.getId();
+ Integer blue = changeScore.getBlue();
+ Integer red = changeScore.getRed();
+ WorldCupCompetitor worldCupCompetitor = this.getById(id);
+ List<WorldCupCompetitor> blueList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode())
+ .eq("participant", 1).eq("worldCupId", worldCupCompetitor.getWorldCupId()));
+ WorldCup worldCup = worldCupService.getById(blueList.get(0).getWorldCupId());
+ for (WorldCupCompetitor cupCompetitor : blueList) {
+ //如果之前输了，现在赢/平了，需要增加积分
+ if(cupCompetitor.getMatchResult() == -1 && (blue.compareTo(red) > 0 || blue.compareTo(red) == 0)){
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(cupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral());
+ vo.setType(7);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+
+ cupCompetitor.setMatchResult(1);
+ cupCompetitor.setWinIntegral(worldCup.getWinIntegral());
+ }
+ //如果之前赢了，现在输了，需要扣减积分
+ if(cupCompetitor.getMatchResult() == 1 && blue.compareTo(red) < 0){
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(cupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral() * -1);
+ vo.setType(8);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+
+ cupCompetitor.setMatchResult(-1);
+ cupCompetitor.setWinIntegral(0);
+ }
+ //如果之前平了，现在输了，需要扣减积分
+ if(cupCompetitor.getMatchResult() == 0 && blue.compareTo(red) < 0){
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(cupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral() * -1);
+ vo.setType(8);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+
+ cupCompetitor.setMatchResult(-1);
+ cupCompetitor.setWinIntegral(0);
+ }
+ cupCompetitor.setOurScore(blue);
+ cupCompetitor.setOpponentScore(red);
+ cupCompetitor.setWorldCupId(null);
+ }
+ this.updateBatchById(blueList);
+
+ List<WorldCupCompetitor> redList = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode())
+ .eq("participant", 2).eq("worldCupId", worldCupCompetitor.getWorldCupId()));
+ for (WorldCupCompetitor cupCompetitor : redList) {
+ //如果之前输了，现在赢/平了，需要增加积分
+ if(cupCompetitor.getMatchResult() == -1 && (red.compareTo(blue) > 0 || red.compareTo(blue) == 0)){
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(cupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral());
+ vo.setType(7);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+
+ cupCompetitor.setMatchResult(1);
+ cupCompetitor.setWinIntegral(worldCup.getWinIntegral());
+ }
+ //如果之前赢了，现在输了，需要扣减积分
+ if(cupCompetitor.getMatchResult() == 1 && red.compareTo(blue) < 0){
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(cupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral() * -1);
+ vo.setType(8);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+
+ cupCompetitor.setMatchResult(-1);
+ cupCompetitor.setWinIntegral(0);
+ }
+ //如果之前平了，现在输了，需要扣减积分
+ if(cupCompetitor.getMatchResult() == 0 && red.compareTo(blue) < 0){
+ //增加积分明细
+ SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
+ vo.setAppUserId(cupCompetitor.getAppUserId());
+ vo.setIntegral(worldCup.getWinIntegral() * -1);
+ vo.setType(8);
+ userIntegralChangesClient.saveUserIntegralChanges(vo);
+
+ cupCompetitor.setMatchResult(-1);
+ cupCompetitor.setWinIntegral(0);
+ }
+ cupCompetitor.setOurScore(red);
+ cupCompetitor.setOpponentScore(blue);
+ cupCompetitor.setWorldCupId(null);
+ }
+ this.updateBatchById(redList);
+
+
+ //修改勋章
+ List<WorldCupCompetitor> worldCupCompetitors = this.list(new QueryWrapper<WorldCupCompetitor>().eq("code", worldCupCompetitor.getCode()));
+ for (WorldCupCompetitor wcc : worldCupCompetitors) {
+ Integer appUserId = wcc.getAppUserId();
+ //常胜将军
+ if(1 == wcc.getMatchResult()){
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId).eq("matchResult", 1));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(5);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+ //越战越勇
+ int count = this.count(new QueryWrapper<WorldCupCompetitor>().eq("appUserId", appUserId));
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(appUserId);
+ studentHonor.setHonorType(6);
+ studentHonor.setNumber(count);
+ studentHonorClient.saveStudentHonor(studentHonor);
+ }
+
+ }
+
+
+ /**
+ * 获取用户比赛记录详情
+ * @param userGameRecordList
+ * @return
+ */
+ @Override
+ public Map<String, Object> userGameRecordList(UserGameRecordList userGameRecordList) {
+ String name = userGameRecordList.getUserName();
+ List<Map<String, Object>> list = this.baseMapper.userGameRecordList(userGameRecordList.getName());
+ List<Map<String, Object>> mapList = new ArrayList<>();
+ for (Map<String, Object> map : list) {
+ Long participantType = Long.valueOf(map.get("participantType").toString());
+ Long participantId = Long.valueOf(map.get("participantId").toString());
+ Integer ourScore = Integer.valueOf(map.get("ourScore").toString());
+ Integer opponentScore = Integer.valueOf(map.get("opponentScore").toString());
+ Integer matchResult = Integer.valueOf(map.get("matchResult").toString());
+ if(1 == participantType){
+ TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if(ToolUtil.isNotEmpty(name) && tStudent.getName().indexOf(name) == -1){
+ continue;
+ }
+ map.put("userName", tStudent.getName());
+ }else{
+ Participant participant = participantClient.getParticipant(participantId);
+ if(ToolUtil.isNotEmpty(name) && participant.getName().indexOf(name) == -1){
+ continue;
+ }
+ map.put("userName", participant.getName());
+ }
+ map.put("score", ourScore + ":" + opponentScore);
+ map.put("matchResult", matchResult == 1 ? "胜" : matchResult == 0 ? "平" :"负");
+ mapList.add(map);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", mapList.size());
+ Integer offset = userGameRecordList.getOffset();
+ Integer limit = userGameRecordList.getLimit();
+ limit += offset;
+ map.put("rows", mapList.subList(offset, mapList.size() >= limit ? limit : mapList.size()));
+ return map;
+ }
+
+
+ /**
+ * 获取比赛场次
+ * @param worldCupId
+ * @return
+ */
+ @Override
+ public int getMatchTime(Integer worldCupId) {
+ return this.baseMapper.getMatchTime(worldCupId);
+ }
}
--
Gitblit v1.7.1