liujie
3 天以前 dd556df997e268153bf1a74616f49b25db11ed3f
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -25,8 +25,10 @@
import com.dsh.communityWorldCup.model.*;
import com.dsh.communityWorldCup.service.*;
import com.dsh.communityWorldCup.util.*;
import com.dsh.communityWorldCup.util.wx.WxV3PayConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -79,9 +81,6 @@
    private UserIntegralChangesClient userIntegralChangesClient;
    /**
     * 裁判获取世界杯列表数据
     * @return
@@ -92,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);
            }
        }
@@ -119,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<>();
@@ -159,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();
@@ -172,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);
@@ -181,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());
        }
    }
@@ -215,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();
@@ -233,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);
@@ -242,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) {
@@ -303,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;
        }
@@ -314,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) {
@@ -348,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);
        }
@@ -377,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;
@@ -385,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);
        }
@@ -397,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;
            }
@@ -411,9 +441,6 @@
        checkPaymentMethodVo.setClassHour(classHour);
        return checkPaymentMethodVo;
    }
    /**
@@ -424,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("世界杯赛事已结束,无法完成报名");
        }
@@ -439,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("已超出最大报名人数");
            }
        }
@@ -460,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() + "】年龄不符合要求");
                }
            }
@@ -510,6 +537,8 @@
        }
        return payment;
    }
    private String smid = "2088330203191220";//平台支付宝商户号
    /**
@@ -532,29 +561,68 @@
        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);
                return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
                        worldCupPayment.getAmount().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
                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 {
                    Integer storeId = list.get(0).getStoreId();
                    Store store = storeClient.queryStoreById(storeId);
                    if (store.getOperatorId() == null || store.getOperatorId() == 0) {
                        // 平台
                        return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
                                worldCupPayment.getAmount().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
                    } else {
                        String s2 = storeClient.getmerchantNumberByOperatorId(store.getOperatorId());
                        System.err.println("微信商户号" + s2);
                        if (!StringUtils.hasLength(s2)) {
                            return ResultUtil.error("运营商未配置微信商户号,获取支付失败!");
                        }
                        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()));
                worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
                worldCupPaymentService.save(worldCupPayment);
                return payMoneyUtil.alipay("2088330203191220", "社区世界杯报名", "世界杯报名", "", worldCupPayment.getCode(),
                List<WorldCupStore> list = worldCupStoreService.lambdaQuery().eq(WorldCupStore::getWorldCupId, worldCup.getId()).list();
                if (list.isEmpty()) {
                } else {
                    Integer storeId = list.get(0).getStoreId();
                    Store store = storeClient.queryStoreById(storeId);
                    if (store.getOperatorId() == null || store.getOperatorId() == 0) {
                    } else {
                        String s2 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
                        System.err.println("支付宝商户号" + s2);
                        if (!StringUtils.hasLength(s2)) {
                            return ResultUtil.error("运营商未配置支付宝商户号,获取支付失败!");
                        }
                        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);
@@ -589,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);
@@ -597,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("报名失败,课时不足,请续课!");
                }
@@ -605,7 +673,7 @@
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    //是否是学员(0=否,1=是)
                    Integer isStudent = jsonObject.getInteger("isStudent");
                    if(0 == isStudent){
                    if (0 == isStudent) {
                        return ResultUtil.error("非学员无法使用课时报名");
                    }
                }
@@ -627,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());
@@ -641,7 +709,7 @@
                            deductionClassHour.setCoursePackageId(packageOrderStudent.getCoursePackageId());
                            packageOrderStudent.setLaveClassHours(0);
                            list.add(deductionClassHour);
                        }else{
                        } else {
                            //够扣除直接跳出进行下个学员
                            deductionClassHour.setId(packageOrderStudent.getId());
                            deductionClassHour.setClassHour(classHour);
@@ -672,7 +740,7 @@
                return ResultUtil.success();
            }
        }else{
        } else {
            worldCupPayment.setPayType(0);
            worldCupPayment.setAmount(BigDecimal.ZERO);
            worldCupPayment.setPayStatus(2);
@@ -712,7 +780,7 @@
     * @return
     */
    @Override
    public ResultUtil paymentWorldCupCallback(String code, String outTradeNo) {
    public ResultUtil paymentWorldCupCallback(String code, String outTradeNo) throws AlipayApiException {
        WorldCupPayment worldCupPayment = worldCupPaymentService.getOne(new QueryWrapper<WorldCupPayment>().eq("code", code));
        Integer worldCupId = worldCupPayment.getWorldCupId();
        worldCupPayment.setPayStatus(2);
@@ -740,6 +808,35 @@
            worldCupPaymentParticipant.setCreateTime(new Date());
            worldCupPaymentParticipantService.save(worldCupPaymentParticipant);
        }
        if (worldCupPayment.getPayType() == 2) {
            List<WorldCupStore> list = worldCupStoreService.lambdaQuery().eq(WorldCupStore::getWorldCupId, worldCupPayment.getWorldCupId()).list();
            String resSmid = smid;
            if (!list.isEmpty()) {
                Integer storeId = list.get(0).getStoreId();
                Store store = storeClient.queryStoreById(storeId);
                if (store.getOperatorId() == null || store.getOperatorId() == 0) {
                } else {
                    String s2 = storeClient.getmerchantNumberAliByOperatorId(store.getOperatorId());
                    System.err.println("支付宝商户号" + s2);
                    if (!StringUtils.hasLength(s2)) {
                        return ResultUtil.error("运营商未配置支付宝商户号,获取支付失败!");
                    }
                    resSmid = s2;
                }
            }
            String finalResSmid = resSmid;
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        Thread.sleep(30000);
                        payMoneyUtil.confirm(finalResSmid, code, outTradeNo, worldCupPayment.getAmount().toString());
                    } catch (Exception e) {
                    }
                }
            }).start();
        }
        return ResultUtil.success();
    }
@@ -759,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);
@@ -776,36 +873,50 @@
     * @param id
     */
    @Override
    public void cancelWorldCupRefund(Integer id) {
    public void cancelWorldCupRefund(Integer id) throws Exception {
        //免费除外
        List<WorldCupPayment> list2 = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id)
                .ne("payType", 0).eq("payStatus", 2).eq("state", 1));
        List<WorldCupStore> list = worldCupStoreService.lambdaQuery().eq(WorldCupStore::getWorldCupId, id).list();
        Integer storeId = list.get(0).getStoreId();
        Store store = storeClient.queryStoreById(storeId);
        for (WorldCupPayment worldCupPayment : list2) {
            List<WorldCupPaymentParticipant> list1 = worldCupPaymentParticipantService.list(new QueryWrapper<WorldCupPaymentParticipant>()
                    .eq("worldCupId", id).eq("worldCupPaymentId", worldCupPayment.getId()).eq("alreadyEntered", 0));
            //总支付金额
            BigDecimal multiply = worldCupPayment.getUnitPrice().multiply(new BigDecimal(list1.size()));
            //微信支付
            if(worldCupPayment.getPayType() == 1){
                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"))){
                    System.err.println("-------------微信退款失败---------");
                    System.err.println(map.get("return_msg"));
                }else{
                    worldCupPayment.setRefundAmount(multiply);
                    worldCupPaymentService.updateById(worldCupPayment);
            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 {
                    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"))) {
                        System.err.println("-------------微信退款失败---------");
                        System.err.println(map.get("return_msg"));
                    } else {
                        worldCupPayment.setRefundAmount(multiply);
                        worldCupPaymentService.updateById(worldCupPayment);
                    }
                }
            }
            //支付宝支付
            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());
@@ -816,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());
@@ -829,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);
@@ -860,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);
        }
    }
@@ -890,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);
            }