赛事模块

liujie

3 天以前 dd556df997e268153bf1a74616f49b25db11ed3f

赛事模块

 cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java

@@ -109,6 +109,16 @@
                        detail.setConsumeName("社区世界杯调整比分");
                        detail.setDetailsType(1);
                        break;
                    case 9:
                        detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
                        detail.setConsumeName("社区世界杯平场");
                        detail.setDetailsType(2);
                        break;
                    case 10:
                        detail.setConsumeAmount("" + (userIntegralChange.getNewIntegral() - userIntegralChange.getOldIntegral()));
                        detail.setConsumeName("社区世界杯败场");
                        detail.setDetailsType(2);
                        break;
                    default:
                        break;
                }

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -275,6 +275,16 @@
        if(0 == isStudent){
            isStudent = 2;
        }
        WorldCup worldCup = worldCupService.getById(worldCupPeople.getWorldCupId());
        if(null == worldCup){
            return ResultUtil.error("当前比赛不存在");
        }
        if(worldCup.getStartTime().getTime()>System.currentTimeMillis() || worldCup.getEndTime().getTime()<System.currentTimeMillis()){
            return ResultUtil.error("二维码仅支持在赛事有效期使用");
        }



        WorldCupPaymentParticipant worldCupPaymentParticipant = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>()
                .eq("worldCupId", worldCupPeople.getWorldCupId()).eq("participantId", id).eq("participantType", isStudent)
                .orderByDesc("createTime").last(" limit 0, 1"));
@@ -351,6 +361,15 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil startWorldCup(StartWorldCup startWorldCup){
        return worldCupService.startWorldCup(startWorldCup);
    }
    @ResponseBody
    @PostMapping("/api/worldCup/endWorldCup")
    @ApiOperation(value = "裁判结束比赛【3.1】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil endWorldCup(StartWorldCup startWorldCup){
        return worldCupService.startWorldCup(startWorldCup);
    }

@@ -694,6 +713,26 @@
        }
    }

    @ResponseBody
    @PostMapping("/api/worldCup/getWorldCupListFromRank")
    @ApiOperation(value = "获取报名的赛事 排名使用【3.1】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<WorldCupListVo>> getWorldCupListFromRank(){
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            List<WorldCupListVo> worldCupRank1 = worldCupCompetitorService.getWorldCupListFromRank(uid);
            return ResultUtil.success(worldCupRank1);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    /**
     * 获取学员参与数量

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupCompetitor.java

@@ -76,6 +76,16 @@
    @TableField("winIntegral")
    private Integer winIntegral;
    /**
     * 平场奖励
     */
    @TableField("drawIntegral")
    private Integer drawIntegral;
    /**
     * 败场奖励
     */
    @TableField("loseIntegral")
    private Integer loseIntegral;
    /**
     * 比赛开始时间
     */
    @TableField("startTime")

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/model/SaveUserIntegralChangesVo.java

@@ -13,7 +13,7 @@
     */
    private Integer appUserId;
    /**
     * 积分类型（1=赠送积分，2=兑换商品，3=完成课后练习，4=观看教学视频，5=参与世界杯，6=世界杯获胜）
     * 积分类型（1=赠送积分，2=兑换商品，3=完成课后练习，4=观看教学视频，5=参与世界杯，6=世界杯获胜 9平场世界杯  10败场世界杯）
     */
    private Integer type;
    /**

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/mapper/WorldCupCompetitorMapper.java

@@ -35,10 +35,10 @@
     * @param worldCupRank
     * @return
     */
    List<Map<String, Object>> getWorldCupRank(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds);
    List<Map<String, Object>> getWorldCupRank(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime);
    
    
    List<Map<String, Object>> getWorldCupRank1(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds);
    List<Map<String, Object>> getWorldCupRank1(@Param("item") WorldCupRank worldCupRank, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime);


    /**
@@ -46,14 +46,14 @@
     * @param worldCupRecords
     * @return
     */
    List<Map<String, Object>> worldCupRecordsList(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds);
    List<Map<String, Object>> worldCupRecordsList(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime);
    
    /**
     * 获取比赛排行榜列表数据
     * @param worldCupRecords
     * @return
     */
    List<Map<String, Object>> worldCupRecordsList1(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds);
    List<Map<String, Object>> worldCupRecordsList1(@Param("item") WorldCupRecords worldCupRecords, @Param("appUserIds") List<Integer> appUserIds, @Param("sTime") String sTime, @Param("eTime") String eTime);


    int worldCupRecordsListCount(@Param("appUserIds") List<Integer> appUserIds);
@@ -87,4 +87,8 @@
     * @return
     */
    int getMatchTime(@Param("worldCupId") Integer worldCupId);

    List<WorldCupListVo> getWorldCupListFromRank(@Param("uid") Integer uid);


}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/EndWorldCup.java

New file
@@ -0,0 +1,20 @@
package com.dsh.communityWorldCup.model;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @Date 2024/2/19 15:24
 */
@Data
@ApiModel
public class EndWorldCup {
    @ApiModelProperty(value = "世界杯id", required = true, dataType = "int")
    private Integer worldCupId;

    @ApiModelProperty(value = "结果", required = true, dataType = "String")
    private String result;

}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupInfo.java

@@ -50,6 +50,10 @@
    private String intro;
    @ApiModelProperty("富文本")
    private String content;
    @ApiModelProperty("参赛协议")
    private String contentOne;
    @ApiModelProperty("1or null智慧赛事  2非智慧赛事")
    private Integer type;
    @ApiModelProperty("门店信息")
    private List<Map<String, Object>> storeInfos;
}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupRank.java

@@ -21,5 +21,12 @@
    private Integer radius;
    @ApiModelProperty(value = "排序，1=场次，2=胜率", required = true, dataType = "int")
    private Integer sort;

    @ApiModelProperty("赛事id")
    private Integer worldCupId;

    @ApiModelProperty("季度时间2020-01-01 - 2022-03-31")
    private String time;

    private Integer appUserId;
}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupRankVo.java

@@ -21,6 +21,8 @@
    private Integer totalSession;
    @ApiModelProperty("胜率")
    private Double winRate;
    @ApiModelProperty("积分")
    private Integer integral;
    @ApiModelProperty("是否是自己（0=否，1=是）")
    private Integer oneself;
}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/model/WorldCupRecords.java

@@ -16,6 +16,11 @@
     * 市名称
     */
    private String city;

    /**
     * 时间
     */
    private String time;
    /**
     * 页码
     */

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/IWorldCupCompetitorService.java

@@ -92,4 +92,7 @@
     * @return
     */
    int getMatchTime(Integer worldCupId);


    List<WorldCupListVo> getWorldCupListFromRank(Integer uid);
}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java

@@ -30,6 +30,7 @@
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -168,10 +169,19 @@
            AppUser appUser = appUserClient.getAppUser(worldCupRank.getAppUserId());
            appUserIds = appUserClient.getAppUserIds(appUser.getCityCode());
        }
        String sTime = null;
        String eTime = null;
        if(ToolUtil.isNotEmpty(worldCupRank.getTime())){
            sTime = worldCupRank.getTime().split(" - ")[0] + " 00:00:00";
            eTime = worldCupRank.getTime().split(" - ")[1] + " 23:59:59";
        }

        //总场次
        List<Map<String, Object>> lists = this.baseMapper.getWorldCupRank(worldCupRank, appUserIds);
        List<Map<String, Object>> lists = this.baseMapper.getWorldCupRank(worldCupRank, appUserIds, sTime, eTime);

        //未负的数据
        List<Map<String, Object>> lists1 = this.baseMapper.getWorldCupRank1(worldCupRank, appUserIds);
        List<Map<String, Object>> lists1 = this.baseMapper.getWorldCupRank1(worldCupRank, appUserIds, sTime, eTime);
        
        List<Map<String, Object>> mapList = new ArrayList<>();
        for (int i = 0; i < lists.size(); i++) {
            Map<String, Object> map = lists.get(i);
@@ -179,6 +189,9 @@
            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());
            Integer winIntegral = Integer.valueOf(null == map.get("winIntegral") ? "0" : map.get("winIntegral").toString());
            Integer drawIntegral = Integer.valueOf(null == map.get("drawIntegral") ? "0" : map.get("drawIntegral").toString());
            Integer loseIntegral = Integer.valueOf(null == map.get("loseIntegral") ? "0" : map.get("loseIntegral").toString());
            //学员
            if(participantType == 1){
                TStudent tStudent = studentClient.queryById(participantId.intValue());
@@ -194,6 +207,7 @@
                }
            }
            map.put("totalSession", num);
            map.put("totalIntegral", winIntegral+drawIntegral+loseIntegral);
            map.put("winRate", "0");
            for (Map<String, Object> objectMap : lists1) {
                Integer participantType1 = Integer.valueOf(objectMap.get("participantType").toString());
@@ -207,22 +221,30 @@
            }
            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;
                }
            });
        }






//        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);
@@ -230,12 +252,14 @@
            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 totalIntegral = Integer.valueOf(map.get("totalIntegral").toString());
            Double winRate = Double.valueOf(map.get("winRate").toString());
            //自己排名在20内的标识
            boolean b = false;
            if(i <= 19){
                WorldCupRankVo worldCupRankVo = new WorldCupRankVo();
                worldCupRankVo.setRank(i + 1);
                worldCupRankVo.setIntegral(totalIntegral);
                worldCupRankVo.setTotalSession(totalSession);
                worldCupRankVo.setWinRate(winRate);
                //学员
@@ -314,6 +338,8 @@
                }
            }
        }
        // 排序
        list= list.stream().sorted(Comparator.comparing(WorldCupRankVo::getIntegral).reversed().thenComparing(WorldCupRankVo::getTotalSession).reversed().thenComparing(WorldCupRankVo::getWinRate).reversed()).collect(Collectors.toList());
        return list;
    }

@@ -346,13 +372,31 @@
                    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.setDrawIntegral(0);
                    worldCupCompetitor.setLoseIntegral(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);
                    }else if(null != worldCup.getDrawIntegral() && 0 < worldCup.getDrawIntegral() && blue_score.compareTo(red_score) == 0){
                        worldCupCompetitor.setDrawIntegral(worldCup.getDrawIntegral());
                        //增加积分明细
                        SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
                        vo.setAppUserId(worldCupCompetitor.getAppUserId());
                        vo.setIntegral(worldCup.getDrawIntegral());
                        vo.setType(9);
                        userIntegralChangesClient.saveUserIntegralChanges(vo);
                    }else if(null != worldCup.getLoseIntegral() && 0 < worldCup.getLoseIntegral() && blue_score.compareTo(red_score) < 0){
                        worldCupCompetitor.setDrawIntegral(worldCup.getLoseIntegral());
                        //增加积分明细
                        SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
                        vo.setAppUserId(worldCupCompetitor.getAppUserId());
                        vo.setIntegral(worldCup.getLoseIntegral());
                        vo.setType(10);
                        userIntegralChangesClient.saveUserIntegralChanges(vo);
                    }
                }
@@ -363,13 +407,31 @@
                    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.setDrawIntegral(0);
                    worldCupCompetitor.setLoseIntegral(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);
                    }else if(null != worldCup.getDrawIntegral() && 0 < worldCup.getDrawIntegral() && blue_score.compareTo(red_score) == 0){
                        worldCupCompetitor.setDrawIntegral(worldCup.getDrawIntegral());
                        //增加积分明细
                        SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
                        vo.setAppUserId(worldCupCompetitor.getAppUserId());
                        vo.setIntegral(worldCup.getDrawIntegral());
                        vo.setType(9);
                        userIntegralChangesClient.saveUserIntegralChanges(vo);
                    }else if(null != worldCup.getLoseIntegral() && 0 < worldCup.getLoseIntegral() && blue_score.compareTo(red_score) < 0){
                        worldCupCompetitor.setDrawIntegral(worldCup.getLoseIntegral());
                        //增加积分明细
                        SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
                        vo.setAppUserId(worldCupCompetitor.getAppUserId());
                        vo.setIntegral(worldCup.getLoseIntegral());
                        vo.setType(10);
                        userIntegralChangesClient.saveUserIntegralChanges(vo);
                    }
                }
@@ -416,8 +478,15 @@
        appUserIdsByCityName.setProvince(worldCupRecords.getProvince());
        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);
        String time = worldCupRecords.getTime();
        String sTime = null;
        String eTime = null;
        if(ToolUtil.isNotEmpty(time)){
            sTime = time.split(" - ")[0] + " 00:00:00";
            eTime = time.split(" - ")[1] + " 23:59:59";
        }
        List<Map<String, Object>> mapList = this.baseMapper.worldCupRecordsList(worldCupRecords, appUserIds,sTime,eTime);
        List<Map<String, Object>> mapList1 = this.baseMapper.worldCupRecordsList1(worldCupRecords, appUserIds,sTime,eTime);
        List<Map<String, Object>> list = new ArrayList<>();
        int row_num = 0;
        for (int i = 0; i < mapList.size(); i++) {
@@ -787,4 +856,10 @@
    public int getMatchTime(Integer worldCupId) {
        return this.baseMapper.getMatchTime(worldCupId);
    }

    @Override
    public List<WorldCupListVo> getWorldCupListFromRank(Integer uid) {

        return this.baseMapper.getWorldCupListFromRank(uid);
    }
}

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java

@@ -81,9 +81,6 @@
    private UserIntegralChangesClient userIntegralChangesClient;





    /**
     * 裁判获取世界杯列表数据
     * @return
@@ -94,11 +91,11 @@
        for (WorldCupListCoachVo worldCupListCoachVo : worldCupListCoach1) {
            String lat = worldCupListCoachVo.getLat();
            String lon = worldCupListCoachVo.getLon();
            if(ToolUtil.isNotEmpty(worldCupListCoach.getLon()) && ToolUtil.isNotEmpty(worldCupListCoach.getLat())){
            if (ToolUtil.isNotEmpty(worldCupListCoach.getLon()) && ToolUtil.isNotEmpty(worldCupListCoach.getLat())) {
                Map<String, Double> distance2 = GeodesyUtil.getDistance(lon + "," + lat, worldCupListCoach.getLon() + "," + worldCupListCoach.getLat());
                Double wgs842 = distance2.get("WGS84");
                worldCupListCoachVo.setDistance(wgs842);
            }else{
            } else {
                worldCupListCoachVo.setDistance(0D);
            }
        }
@@ -121,28 +118,53 @@
    @Override
    public ResultUtil startWorldCup(StartWorldCup startWorldCup) {
        WorldCup worldCup = this.getById(startWorldCup.getWorldCupId());
        if(worldCup.getStartTime().getTime() > System.currentTimeMillis()){
        if (worldCup.getStartTime().getTime() > System.currentTimeMillis()) {
            return ResultUtil.error("赛事还未开始");
        }
        if(worldCup.getEndTime().getTime() <= System.currentTimeMillis()){
        if (worldCup.getEndTime().getTime() <= System.currentTimeMillis()) {
            return ResultUtil.error("赛事已结束");
        }
        if(worldCup.getStatus() == 4){
        if (worldCup.getStatus() == 4) {
            return ResultUtil.error("赛事已取消");
        }
        //1、通过扫码获取的sutuid查询t_game表中的红蓝方sutuid
        // 智慧需要判断code

        String code = startWorldCup.getCode();
        JSONObject object = JSON.parseObject(code);
        String sutu_id = object.getString("sutu_id");
        TGame tGame = gameClient.getTGameBySutuId(sutu_id);
        if(null == tGame){
            return ResultUtil.error("无效的游戏二维码");
        if (worldCup.getType() == null || worldCup.getType() == 1) {
            if (null == tGame) {
                return ResultUtil.error("无效的游戏二维码");
            }
        }

        String people = startWorldCup.getPeople();
        JSONArray jsonArray = JSON.parseArray(people);
        if(jsonArray.size() != 6){
            return ResultUtil.error("参赛人数只能是6人");
        int red=0;
        int blue=0;
        for (Object o : jsonArray) {
            JSONObject jsonObject = JSONObject.parseObject(o.toString());
            String type = jsonObject.get("type").toString();
            if("red".equals( type)){
                red++;
            }
            if("blue".equals( type)){
                blue++;
            }
        }
        if(red==0){
            return ResultUtil.error("红方最少要1人参赛");
        }
        if(red>5){
            return ResultUtil.error("红方最多5人参赛");
        }
        if(blue==0){
            return ResultUtil.error("蓝方最少要1人参赛");
        }
        if(blue>5){
            return ResultUtil.error("蓝方最多5人参赛");
        }
        String timeStr = UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3);
        List<Long> ids = new ArrayList<>();
@@ -161,7 +183,7 @@
            worldCupCompetitor.setParticipant("blue".equals(type) ? 1 : 2);
            worldCupCompetitor.setStartTime(new Date());
            //添加参赛奖励
            if(null != worldCup.getParticipationIntegral() && 0 < worldCup.getParticipationIntegral()){
            if (null != worldCup.getParticipationIntegral() && 0 < worldCup.getParticipationIntegral()) {
                worldCupCompetitor.setParticipationIntegral(worldCup.getParticipationIntegral());
                //增加积分明细
                SaveUserIntegralChangesVo vo = new SaveUserIntegralChangesVo();
@@ -174,7 +196,7 @@
            worldCupCompetitorService.save(worldCupCompetitor);
            ids.add(worldCupCompetitor.getId());
            //已参赛
            if(0 == worldCupPaymentParticipant.getAlreadyEntered()){
            if (0 == worldCupPaymentParticipant.getAlreadyEntered()) {
                worldCupPaymentParticipant.setWorldCupId(null);
                worldCupPaymentParticipant.setAlreadyEntered(1);
                worldCupPaymentParticipantService.updateById(worldCupPaymentParticipant);
@@ -183,26 +205,32 @@
        worldCup.setMatchNumber(worldCup.getMatchNumber() + 1);
        this.updateById(worldCup);


        //2、调起开启游戏的接口。

        JSONObject jsonObject = new JSONObject();
        jsonObject.put("gameType", 1);
        jsonObject.put("ids", ids);
        //2、调起开启游戏的接口。
        HashMap<String, String> map = new HashMap<>();
        map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
        map.put("space_id", tGame.getSiteId() + "");
        map.put("red_sutu_id", tGame.getRed());
        map.put("blue_sutu_id", tGame.getBlue());
        map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
        map.put("custom", jsonObject.toJSONString());
        if (worldCup.getType() == null || worldCup.getType() == 1) {
            HashMap<String, String> map = new HashMap<>();
            map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
            map.put("space_id", tGame.getSiteId() + "");
            map.put("red_sutu_id", tGame.getRed());
            map.put("blue_sutu_id", tGame.getBlue());
            map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
            map.put("custom", jsonObject.toJSONString());

        String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
        JSONObject jsonObject1 = JSONObject.parseObject(s);
        Integer code1 = jsonObject1.getInteger("code");
        String message = jsonObject1.getString("message");
        if (200 == code1) {
            return ResultUtil.success();
        } else {
            return ResultUtil.error(message);
            String s = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/quickStart", map);
            JSONObject jsonObject1 = JSONObject.parseObject(s);
            Integer code1 = jsonObject1.getInteger("code");
            String message = jsonObject1.getString("message");
            if (200 == code1) {
                return ResultUtil.success(jsonObject.toJSONString());
            } else {
                return ResultUtil.error(message);
            }
        }else {
            return ResultUtil.success(jsonObject.toJSONString());
        }
    }

@@ -217,11 +245,11 @@
        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->{
        list.forEach(v -> {
            v.setWorldCupId(null);
            v.setTips(1);
        });
        if(list.size() > 0){
        if (list.size() > 0) {
            worldCupCompetitorService.updateBatchById(list);
        }
        return list.size();
@@ -235,7 +263,7 @@
     */
    @Override
    public List<WorldCupListVo> getWorldCupList(WorldCupList worldCupList) {
        if(null != worldCupList.getGender() && 0 == worldCupList.getGender()){
        if (null != worldCupList.getGender() && 0 == worldCupList.getGender()) {
            worldCupList.setGender(null);
        }
        List<WorldCupListVo> worldCupList1 = this.baseMapper.getWorldCupList(worldCupList);
@@ -244,36 +272,36 @@
            List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id).eq("payStatus", 2).eq("state", 1));
            List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
            Integer heat = worldCupListVo.getHeat();
            if(collect.size() > 0){
            if (collect.size() > 0) {
                int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
                heat += count;
            }
            worldCupListVo.setHeat(heat);
            String lat = worldCupListVo.getLat();
            String lon = worldCupListVo.getLon();
            if(ToolUtil.isNotEmpty(lat) && ToolUtil.isNotEmpty(lon)){
            if (ToolUtil.isNotEmpty(lat) && ToolUtil.isNotEmpty(lon)) {
                Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, worldCupList.getLon() + "," + worldCupList.getLat());
                worldCupListVo.setDistance(distance.get("WGS84"));
            }else{
            } else {
                worldCupListVo.setDistance(0D);
            }
        }


        if(null != worldCupList.getSort()){
        if (null != worldCupList.getSort()) {
            Collections.sort(worldCupList1, new Comparator<WorldCupListVo>() {
                @Override
                public int compare(WorldCupListVo o1, WorldCupListVo o2) {
                    if(worldCupList.getSort() == 1){
                    if (worldCupList.getSort() == 1) {
                        return o1.getHeat().compareTo(o2.getHeat());
                    }
                    if(worldCupList.getSort() == 2){
                    if (worldCupList.getSort() == 2) {
                        return o1.getHeat().compareTo(o2.getHeat()) * -1;
                    }
                    return 0;
                }
            });
        }else{
        } else {
            Collections.sort(worldCupList1, new Comparator<WorldCupListVo>() {
                @Override
                public int compare(WorldCupListVo o1, WorldCupListVo o2) {
@@ -305,7 +333,7 @@
        List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id).eq("payStatus", 2).eq("state", 1));
        List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
        Integer heat = worldCupInfo.getHeat();
        if(collect.size() > 0){
        if (collect.size() > 0) {
            int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
            heat += count;
        }
@@ -316,7 +344,7 @@
            String url = jsonArray1.getJSONObject(i).getString("url");
            imgs += url + ",";
        }
        worldCupInfo.setInfoImg(imgs.substring(0,imgs.length() - 1));
        worldCupInfo.setInfoImg(imgs.substring(0, imgs.length() - 1));
        worldCupInfo.setHeat(heat);
        ArrayList<Map<String, Object>> objects = new ArrayList<>();
        for (WorldCupStore worldCupStore : worldCupStores) {
@@ -350,17 +378,17 @@
        String province = worldCupInfo.getProvince();
        String city = worldCupInfo.getCity();
        int index = address.indexOf("市");
        if(index != -1){
        if (index != -1) {
            address = address.substring(index + 1);
            worldCupInfo.setAddress(address);
        }
        index = province.indexOf("省");
        if(index != -1){
        if (index != -1) {
            province = province.substring(0, index - 1);
            worldCupInfo.setProvince(province);
        }
        index = city.indexOf("市");
        if(index != -1){
        if (index != -1) {
            city = city.substring(0, index - 1);
            worldCupInfo.setCity(city);
        }
@@ -379,7 +407,7 @@
        WorldCup worldCup = this.getById(checkPaymentMethod.getId());
        String[] split = worldCup.getPayType().split(",");
        CheckPaymentMethodVo checkPaymentMethodVo = new CheckPaymentMethodVo();
        if(split.length == 1 && "0".equals(split[0])){
        if (split.length == 1 && "0".equals(split[0])) {
            checkPaymentMethodVo.setPaiCoin(0);
            checkPaymentMethodVo.setClassHour(0);
            return checkPaymentMethodVo;
@@ -387,9 +415,9 @@
        JSONArray jsonArray = JSON.parseArray(checkPaymentMethod.getIds());
        AppUser appUser = appUserClient.getAppUser(checkPaymentMethod.getUid());
        BigDecimal multiply = new BigDecimal(jsonArray.size()).multiply(new BigDecimal(worldCup.getPaiCoin()));
        if(appUser.getPlayPaiCoins() < multiply.intValue()){
        if (appUser.getPlayPaiCoins() < multiply.intValue()) {
            checkPaymentMethodVo.setPaiCoin(0);
        }else{
        } else {
            checkPaymentMethodVo.setPaiCoin(1);
        }

@@ -399,13 +427,13 @@
            Integer id = jsonObject.getInteger("id");
            //是否是学员（0=否，1=是）
            Integer isStudent = jsonObject.getInteger("isStudent");
            if(0 == isStudent){
            if (0 == isStudent) {
                classHour = 0;
                break;
            }
            List<CoursePackageOrderStudent> coursePackageOrderStudent = coursePackageOrderStudentClient.getCoursePackageOrderStudent(id);
            int sum = coursePackageOrderStudent.stream().mapToInt(CoursePackageOrderStudent::getLaveClassHours).sum();
            if(sum < worldCup.getClassHour()){
            if (sum < worldCup.getClassHour()) {
                classHour = 0;
                break;
            }
@@ -413,9 +441,6 @@
        checkPaymentMethodVo.setClassHour(classHour);
        return checkPaymentMethodVo;
    }





    /**
@@ -426,13 +451,13 @@
    @Override
    public ResultUtil paymentWorldCup(PaymentWorldCup paymentWorldCup) {
        WorldCup worldCup = this.getById(paymentWorldCup.getId());
        if(null == worldCup){
        if (null == worldCup) {
            return ResultUtil.error("报名数据异常");
        }
        if(null != worldCup.getRegistrationClosingTime() && System.currentTimeMillis() > worldCup.getRegistrationClosingTime().getTime()){
        if (null != worldCup.getRegistrationClosingTime() && System.currentTimeMillis() > worldCup.getRegistrationClosingTime().getTime()) {
            return ResultUtil.error("报名时间已结束，无法完成报名");
        }
        if(System.currentTimeMillis() > worldCup.getEndTime().getTime()){
        if (System.currentTimeMillis() > worldCup.getEndTime().getTime()) {
            return ResultUtil.error("世界杯赛事已结束，无法完成报名");
        }

@@ -441,14 +466,14 @@
        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){
        if (ids.size() > 0) {
            int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
                    .eq("worldCupPaymentId", ids));
            if((count + jsonArray.size()) >= worldCup.getMaxPeople()){
            if ((count + jsonArray.size()) >= worldCup.getMaxPeople()) {
                return ResultUtil.error("已超出最大报名人数");
            }
        }else{
            if(jsonArray.size() > worldCup.getMaxPeople()){
        } else {
            if (jsonArray.size() > worldCup.getMaxPeople()) {
                return ResultUtil.error("已超出最大报名人数");
            }
        }
@@ -462,42 +487,42 @@
            Long id = jsonObject.getLong("id");
            //是否是学员（0=否，1=是）
            Integer isStudent = jsonObject.getInteger("isStudent");
            if(isStudent == 1){
            if (isStudent == 1) {
                TStudent tStudent = studentClient.queryById(id.intValue());
                if(worldCup.getGender() != 0 && !tStudent.getSex().equals(worldCup.getGender())){
                if (worldCup.getGender() != 0 && !tStudent.getSex().equals(worldCup.getGender())) {
                    return ResultUtil.error("此比赛只能是" + (worldCup.getGender() == 1 ? "男" : "女") + "性参加");
                }
                if(collect.size() > 0){
                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));
                    if(null != one){
                    if (null != one) {
                        return ResultUtil.error("【" + tStudent.getName() + "】已报过名了");
                    }
                }

                if(worldCup.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))){
                if (worldCup.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))) {
                    return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
                }
                if(worldCup.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))){
                if (worldCup.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))) {
                    return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
                }
            }else{
            } else {
                Participant participant = participantClient.getParticipant(id);
                if(worldCup.getGender() != 0 && !participant.getGender().equals(worldCup.getGender())){
                if (worldCup.getGender() != 0 && !participant.getGender().equals(worldCup.getGender())) {
                    return ResultUtil.error("此比赛只能是" + (worldCup.getGender() == 1 ? "男" : "女") + "性参加");
                }
                if(collect.size() > 0){
                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));
                    if(null != one){
                    if (null != one) {
                        return ResultUtil.error("【" + participant.getName() + "】已报过名了");
                    }
                }

                if(worldCup.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())))){
                if (worldCup.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())))) {
                    return ResultUtil.error("【" + participant.getName() + "】年龄不符合要求");
                }
                if(worldCup.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())))){
                if (worldCup.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(participant.getBirthday())))) {
                    return ResultUtil.error("【" + participant.getName() + "】年龄不符合要求");
                }
            }
@@ -536,40 +561,39 @@
        int num = JSON.parseArray(paymentWorldCup.getIds()).size();
        //不免费
        String payType1 = worldCup.getPayType().split(",")[0];
        if(!"0".equals(payType1)){
        if (!"0".equals(payType1)) {
            Integer payType = paymentWorldCup.getPayType();
            //微信
            if(payType == 1){
            if (payType == 1) {
                worldCupPayment.setAmount(new BigDecimal(num).multiply(worldCup.getCash()));
                worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
                worldCupPaymentService.save(worldCupPayment);
                List<WorldCupStore> list = worldCupStoreService.lambdaQuery().eq(WorldCupStore::getWorldCupId, worldCup.getId()).list();
                if (list.isEmpty()){
                                    return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
                        worldCupPayment.getAmount().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
                }else{
                if (list.isEmpty()) {
                    return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
                            worldCupPayment.getAmount().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
                } else {
                    Integer storeId = list.get(0).getStoreId();
                    Store store = storeClient.queryStoreById(storeId);
                    if (store.getOperatorId()==null||store.getOperatorId()==0){
                    if (store.getOperatorId() == null || store.getOperatorId() == 0) {
                        // 平台
                        return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
                                worldCupPayment.getAmount().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
                    }else{
                    } else {
                        String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
                        System.err.println("微信商户号"+s2);
                        if(!StringUtils.hasLength(s2)){
                        System.err.println("微信商户号" + s2);
                        if (!StringUtils.hasLength(s2)) {
                            return ResultUtil.error("运营商未配置微信商户号，获取支付失败!");
                        }
                        return payMoneyUtil.weixinpayV3(s2,"社区世界杯报名",worldCupPayment.getCode()
                                ,"/base/worldCup/wxPayWorldCupCallback1",worldCupPayment.getAmount().toString());
                        return payMoneyUtil.weixinpayV3(s2, "社区世界杯报名", worldCupPayment.getCode()
                                , "/base/worldCup/wxPayWorldCupCallback1", worldCupPayment.getAmount().toString());
                    }
                }



            }
            //支付宝
            if(payType == 2){
            if (payType == 2) {
                String smidRes = smid;// 结算资金到商户号

                worldCupPayment.setAmount(new BigDecimal(num).multiply(worldCup.getCash()));
@@ -577,28 +601,28 @@
                worldCupPaymentService.save(worldCupPayment);
                List<WorldCupStore> list = worldCupStoreService.lambdaQuery().eq(WorldCupStore::getWorldCupId, worldCup.getId()).list();

                if (list.isEmpty()){
            }else{
                if (list.isEmpty()) {
                } else {
                    Integer storeId = list.get(0).getStoreId();
                    Store store = storeClient.queryStoreById(storeId);
                    if (store.getOperatorId()==null||store.getOperatorId()==0){
                    }else{
                    if (store.getOperatorId() == null || store.getOperatorId() == 0) {
                    } else {
                        String s2 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
                        System.err.println("支付宝商户号"+s2);
                        if(!StringUtils.hasLength(s2)){
                        System.err.println("支付宝商户号" + s2);
                        if (!StringUtils.hasLength(s2)) {
                            return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
                        }
                        smidRes=s2;
                        smidRes = s2;
                    }
                }
                return payMoneyUtil.alipay(smidRes, "社区世界杯报名", "世界杯报名", "", worldCupPayment.getCode(),
                        worldCupPayment.getAmount().toString(), "/base/worldCup/aliPayWorldCupCallback");
                }
            }
            //玩湃币
            if(payType == 3){
            if (payType == 3) {
                AppUser appUser = appUserClient.getAppUser(paymentWorldCup.getUid());
                BigDecimal multiply = new BigDecimal(num).multiply(new BigDecimal(worldCup.getPaiCoin()));
                if(appUser.getPlayPaiCoins() < multiply.intValue()){
                if (appUser.getPlayPaiCoins() < multiply.intValue()) {
                    return ResultUtil.error("报名失败，玩湃币不足，请充值！");
                }
                worldCupPayment.setAmount(multiply);
@@ -633,7 +657,7 @@
                return ResultUtil.success();
            }
            //课时
            if(payType == 4){
            if (payType == 4) {
                BigDecimal multiply = new BigDecimal(num).multiply(new BigDecimal(worldCup.getClassHour()));
                String ids = paymentWorldCup.getIds();
                JSONArray jsonArray = JSON.parseArray(ids);
@@ -641,7 +665,7 @@

                List<CoursePackageOrderStudent> coursePackageOrderStudent = coursePackageOrderStudentClient.getCoursePackageOrderUser(paymentWorldCup.getUid());
                int sum = coursePackageOrderStudent.stream().mapToInt(CoursePackageOrderStudent::getLaveClassHours).sum();
                if(sum < worldCup.getClassHour() * num){
                if (sum < worldCup.getClassHour() * num) {
                    return ResultUtil.error("报名失败，课时不足，请续课！");
                }

@@ -649,7 +673,7 @@
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    //是否是学员（0=否，1=是）
                    Integer isStudent = jsonObject.getInteger("isStudent");
                    if(0 == isStudent){
                    if (0 == isStudent) {
                        return ResultUtil.error("非学员无法使用课时报名");
                    }
                }
@@ -671,12 +695,12 @@
                    Integer classHour = worldCup.getClassHour();
                    for (CoursePackageOrderStudent packageOrderStudent : coursePackageOrderStudent) {
                        Integer laveClassHours = packageOrderStudent.getLaveClassHours();
                        if(laveClassHours == 0){
                        if (laveClassHours == 0) {
                            continue;
                        }

                        DeductionClassHour deductionClassHour = new DeductionClassHour();
                        if(classHour.compareTo(laveClassHours) > 0){
                        if (classHour.compareTo(laveClassHours) > 0) {
                            //不够扣除，轮询直到扣除完
                            classHour = classHour - laveClassHours;
                            deductionClassHour.setId(packageOrderStudent.getId());
@@ -685,7 +709,7 @@
                            deductionClassHour.setCoursePackageId(packageOrderStudent.getCoursePackageId());
                            packageOrderStudent.setLaveClassHours(0);
                            list.add(deductionClassHour);
                        }else{
                        } else {
                            //够扣除直接跳出进行下个学员
                            deductionClassHour.setId(packageOrderStudent.getId());
                            deductionClassHour.setClassHour(classHour);
@@ -716,7 +740,7 @@

                return ResultUtil.success();
            }
        }else{
        } else {
            worldCupPayment.setPayType(0);
            worldCupPayment.setAmount(BigDecimal.ZERO);
            worldCupPayment.setPayStatus(2);
@@ -784,20 +808,20 @@
            worldCupPaymentParticipant.setCreateTime(new Date());
            worldCupPaymentParticipantService.save(worldCupPaymentParticipant);
        }
        if (worldCupPayment.getPayType()==2){
        if (worldCupPayment.getPayType() == 2) {
            List<WorldCupStore> list = worldCupStoreService.lambdaQuery().eq(WorldCupStore::getWorldCupId, worldCupPayment.getWorldCupId()).list();
            String resSmid = smid;
            if (!list.isEmpty()){
            if (!list.isEmpty()) {
                Integer storeId = list.get(0).getStoreId();
                Store store = storeClient.queryStoreById(storeId);
                if (store.getOperatorId()==null||store.getOperatorId()==0){
                }else{
                if (store.getOperatorId() == null || store.getOperatorId() == 0) {
                } else {
                    String s2 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
                    System.err.println("支付宝商户号"+s2);
                    if(!StringUtils.hasLength(s2)){
                    System.err.println("支付宝商户号" + s2);
                    if (!StringUtils.hasLength(s2)) {
                        return ResultUtil.error("运营商未配置支付宝商户号，获取支付失败!");
                    }
                    resSmid=s2;
                    resSmid = s2;
                }
            }
            String finalResSmid = resSmid;
@@ -807,7 +831,7 @@
                    try {
                        Thread.sleep(30000);
                        payMoneyUtil.confirm(finalResSmid, code, outTradeNo, worldCupPayment.getAmount().toString());
                    }catch (Exception e){
                    } catch (Exception e) {
                    }
                }
            }).start();
@@ -832,7 +856,7 @@
            List<WorldCupPayment> lists = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id).eq("payStatus", 2).eq("state", 1));
            List<Long> collect = lists.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
            Integer count = 0;
            if(collect.size() > 0){
            if (collect.size() > 0) {
                count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
            }
            map1.put("maxPeople", maxPeople + " - " + count);
@@ -862,17 +886,17 @@
            //总支付金额
            BigDecimal multiply = worldCupPayment.getUnitPrice().multiply(new BigDecimal(list1.size()));
            //微信支付
            if(worldCupPayment.getPayType() == 1){
                if (store.getOperatorId()!=null && store.getOperatorId()!=0){
                    String smidVx= storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
                    if (!StringUtils.hasLength(smidVx)){
            if (worldCupPayment.getPayType() == 1) {
                if (store.getOperatorId() != null && store.getOperatorId() != 0) {
                    String smidVx = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
                    if (!StringUtils.hasLength(smidVx)) {
                        System.err.println("运营商未配置微信商户号，获取支付失败!");
                    }
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                    String codeRefund = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);// 退款单号
                    // 运营商退款
                    payMoneyUtil.weixinRefundV3(smidVx, codeRefund, worldCupPayment.getPayOrderNo(), worldCupPayment.getAmount().toString(), "/base/worldCup/wxRefundWorldCupCallback1");
                }else {
                } else {
                    Map<String, String> map = payMoneyUtil.wxRefund(worldCupPayment.getPayOrderNo(), worldCupPayment.getCode(),
                            worldCupPayment.getAmount().toString(), multiply.toString(), "/base/worldCup/wxRefundWorldCupCallback");
                    if (!"SUCCESS".equals(map.get("return_code"))) {
@@ -885,14 +909,14 @@
                }
            }
            //支付宝支付
            if(worldCupPayment.getPayType() == 2){
            if (worldCupPayment.getPayType() == 2) {
                Map<String, String> map = null;
                try {
                    map = payMoneyUtil.aliRefund(worldCupPayment.getPayOrderNo(), multiply.toString());
                } catch (AlipayApiException e) {
                    throw new RuntimeException(e);
                }
                if("10000".equals(map.get("code"))){
                if ("10000".equals(map.get("code"))) {
                    String trade_no = map.get("trade_no");
                    worldCupPayment.setWorldCupId(null);
                    worldCupPayment.setRefundTime(new Date());
@@ -903,7 +927,7 @@
                }
            }
            //玩湃币支付
            if(worldCupPayment.getPayType() == 3){
            if (worldCupPayment.getPayType() == 3) {
                Integer appUserId = worldCupPayment.getAppUserId();
                AppUser appUser = appUserClient.getAppUser(appUserId);
                appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() + multiply.intValue());
@@ -916,7 +940,7 @@
                worldCupPaymentService.updateById(worldCupPayment);
            }
            //课时支付
            if(worldCupPayment.getPayType() == 4){
            if (worldCupPayment.getPayType() == 4) {
                for (WorldCupPaymentParticipant worldCupPaymentParticipant1 : list1) {
                    String content = worldCupPaymentParticipant1.getContent();
                    DeductionClassHourList deductionClassHourList = JSON.parseObject(content, DeductionClassHourList.class);
@@ -947,14 +971,14 @@
        for (WorldCup worldCup : worldCups) {
            worldCup.setStatus(2);
        }
        if(worldCups.size() > 0){
        if (worldCups.size() > 0) {
            this.updateBatchById(worldCups);
        }
        worldCups = this.list(new QueryWrapper<WorldCup>().eq("status", 2).last(" and endTime <= now()"));
        for (WorldCup worldCup : worldCups) {
            worldCup.setStatus(3);
        }
        if(worldCups.size() > 0){
        if (worldCups.size() > 0) {
            this.updateBatchById(worldCups);
        }
    }
@@ -977,9 +1001,9 @@
            List<WorldCupPayment> list = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id)
                    .eq("payStatus", 2).eq("state", 1));
            List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
            if(collect.size() == 0){
            if (collect.size() == 0) {
                stringObjectMap.put("applicants", 0);
            }else{
            } else {
                int count1 = worldCupPaymentParticipantService.getCount(id, collect);
                stringObjectMap.put("applicants", count1);
            }

 cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml

@@ -110,11 +110,22 @@
        participantType,
        participantId,
        appUserId,
        count(*) as num
        count(*) as num,
        winIntegral,
        drawIntegral,
        loseIntegral
        from t_world_cup_competitor
        where matchResult is not null
        <if test="null != item.year">
            and DATE_FORMAT(startTime, '%Y') = #{item.year}
        </if>
        <if test="null != sTime and null != eTime">
            and startTime between #{sTime} and #{eTime}
        </if>


        <if test="null != item.worldCupId">
            and worldCupId =#{item.worldCupId}
        </if>
        <if test="null != appUserIds and appUserIds.size() > 0">
            and appUserId in
@@ -136,6 +147,12 @@
        where matchResult is not null and matchResult != -1
        <if test="null != item.year">
            and DATE_FORMAT(startTime, '%Y') = #{item.year}
        </if>
        <if test="null != sTime and null != eTime">
            and startTime between #{sTime} and #{eTime}
        </if>
        <if test="null != item.worldCupId">
            and worldCupId =#{item.worldCupId}
        </if>
        <if test="null != appUserIds and appUserIds.size() > 0">
            and appUserId in
@@ -162,6 +179,9 @@
                #{iten}
            </foreach>
        </if>
        <if test="sTime != null and eTime != null">
            and startTime between #{sTime} and #{eTime}
        </if>
        group by participantType, participantId, appUserId
    </select>
    
@@ -178,6 +198,9 @@
            <foreach collection="appUserIds" item="iten" index="index" open="(" separator="," close=")">
                #{iten}
            </foreach>
        </if>
        <if test="sTime != null and eTime != null">
            and startTime between #{sTime} and #{eTime}
        </if>
        group by participantType, participantId, appUserId
    </select>
@@ -311,4 +334,17 @@
    <select id="getMatchTime" resultType="int">
        select count(*) as matchTime from (select code from t_world_cup_competitor where worldCupId = #{worldCupId} group by code) as b
    </select>



    <select id="getWorldCupListFromRank" resultType="com.dsh.communityWorldCup.model.WorldCupListVo">
        select
            c.id,
            b.worldCupId,
            c.name
        from t_world_cup_payment_participant a
                 left join t_world_cup_payment b on (a.worldCupPaymentId = b.id)
                 left join t_world_cup c on (b.worldCupId = c.id)
        where a.appUserId = #{uid} and b.payStatus = 2 and b.refundTime is null and b.state = 1
    </select>
</mapper>

 cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupMapper.xml

@@ -69,7 +69,8 @@
        a.paiCoin,
        a.classHour,
        a.intro,
        a.content
        a.content,
        a.contentOne
        from t_world_cup  a
        where a.id = #{id}
    </select>

 cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/Model/WorldCupRecords.java

@@ -17,6 +17,10 @@
     */
    private String city;
    /**
     * 时间
     */
    private String time;
    /**
     * 页码
     */
    private Integer offset;

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java

@@ -46,6 +46,12 @@
        model.addAttribute("id", id);
        return PREFIX + "worldCupGameStatisticsInfo.html";
    }
    @RequestMapping("/addWorldCupGameStatisticsInfo")
    public String addWorldCupGameStatisticsInfo(Model model, Integer id){
        WorldCup worldCupById = worldCupClient.getWorldCupById(id);
        model.addAttribute("item", worldCupById);
        return PREFIX + "worldCupGameStatisticsInfo.html";
    }


    @RequestMapping("/openWorldCupGameStatisticsListInfo")