bug修改

无关风月

2025-05-08 9486766c806fe1d9e082b2fd02ea1cc558f1b443

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

@@ -89,15 +89,22 @@
    @Override
    public List<WorldCupListCoachVo> getWorldCupListCoach(WorldCupListCoach worldCupListCoach) {
        List<WorldCupListCoachVo> worldCupListCoach1 = this.baseMapper.getWorldCupListCoach(worldCupListCoach);
        for (WorldCupListCoachVo worldCupListCoachVo : worldCupListCoach1) {
            String lat = worldCupListCoachVo.getLat();
            String lon = worldCupListCoachVo.getLon();
            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{
                worldCupListCoachVo.setDistance(0D);
            }
        }
        //对查询结果进行距离排序（直线距离）
        Collections.sort(worldCupListCoach1, new Comparator<WorldCupListCoachVo>() {
            @Override
            public int compare(WorldCupListCoachVo o1, WorldCupListCoachVo o2) {
                Map<String, Double> distance1 = GeodesyUtil.getDistance(o1.getLon() + "," + o1.getLat(), worldCupListCoach.getLon() + "," + worldCupListCoach.getLat());
                Double wgs841 = distance1.get("WGS84");
                Map<String, Double> distance2 = GeodesyUtil.getDistance(o2.getLon() + "," + o2.getLat(), worldCupListCoach.getLon() + "," + worldCupListCoach.getLat());
                Double wgs842 = distance2.get("WGS84");
                return wgs841.compareTo(wgs842);
                return o1.getDistance().compareTo(o2.getDistance());
            }
        });
        return worldCupListCoach1;
@@ -165,25 +172,31 @@
            worldCupCompetitorService.save(worldCupCompetitor);
            ids.add(worldCupCompetitor.getId());
            //已参赛
//            worldCupPaymentParticipant.setAlreadyEntered(1);
//            worldCupPaymentParticipantService.updateById(worldCupPaymentParticipant);
            if(0 == worldCupPaymentParticipant.getAlreadyEntered()){
                worldCupPaymentParticipant.setWorldCupId(null);
                worldCupPaymentParticipant.setAlreadyEntered(1);
                worldCupPaymentParticipantService.updateById(worldCupPaymentParticipant);
            }
        }
        worldCup.setMatchNumber(worldCup.getMatchNumber() + 1);
        this.updateById(worldCup);

        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.getStoreId() + "");
        map.put("space_id", tGame.getSiteId() + "");
        map.put("red_sutu_id", tGame.getRed());
        map.put("blue_sutu_id", tGame.getBlue());
        map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
        map.put("custom", JSON.toJSONString(ids));
        map.put("api_url", "https://online.daowepark.com:443/communityWorldCup/base/worldCup/endWorldCupCallback");
        map.put("custom", jsonObject.toJSONString());

        String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/quickStart", map);
        JSONObject jsonObject = JSONObject.parseObject(s);
        Integer code1 = jsonObject.getInteger("code");
        String message = jsonObject.getString("message");
        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 {
@@ -220,6 +233,9 @@
     */
    @Override
    public List<WorldCupListVo> getWorldCupList(WorldCupList worldCupList) {
        if(null != worldCupList.getGender() && 0 == worldCupList.getGender()){
            worldCupList.setGender(null);
        }
        List<WorldCupListVo> worldCupList1 = this.baseMapper.getWorldCupList(worldCupList);
        for (WorldCupListVo worldCupListVo : worldCupList1) {
            Integer id = Integer.valueOf(worldCupListVo.getId());
@@ -233,8 +249,12 @@
            worldCupListVo.setHeat(heat);
            String lat = worldCupListVo.getLat();
            String lon = worldCupListVo.getLon();
            Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, worldCupList.getLon() + "," + worldCupList.getLat());
            worldCupListVo.setDistance(distance.get("WGS84"));
            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{
                worldCupListVo.setDistance(0D);
            }
        }


@@ -324,6 +344,25 @@
            objects.add(map);
        }
        worldCupInfo.setStoreInfos(objects);
        String address = worldCupInfo.getAddress();
        String province = worldCupInfo.getProvince();
        String city = worldCupInfo.getCity();
        int index = address.indexOf("市");
        if(index != -1){
            address = address.substring(index + 1);
            worldCupInfo.setAddress(address);
        }
        index = province.indexOf("省");
        if(index != -1){
            province = province.substring(0, index - 1);
            worldCupInfo.setProvince(province);
        }
        index = city.indexOf("市");
        if(index != -1){
            city = city.substring(0, index - 1);
            worldCupInfo.setCity(city);
        }

        return worldCupInfo;
    }

@@ -404,6 +443,10 @@
            int count = worldCupPaymentParticipantService.count(new QueryWrapper<WorldCupPaymentParticipant>().eq("worldCupId", worldCup.getId())
                    .eq("worldCupPaymentId", ids));
            if((count + jsonArray.size()) >= worldCup.getMaxPeople()){
                return ResultUtil.error("已超出最大报名人数");
            }
        }else{
            if(jsonArray.size() > worldCup.getMaxPeople()){
                return ResultUtil.error("已超出最大报名人数");
            }
        }
@@ -497,7 +540,7 @@
                worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
                worldCupPaymentService.save(worldCupPayment);
                return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
                        worldCup.getCash().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
                        worldCupPayment.getAmount().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
            }
            //支付宝
            if(payType == 2){
@@ -505,7 +548,7 @@
                worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
                worldCupPaymentService.save(worldCupPayment);
                return payMoneyUtil.alipay("2088330203191220", "社区世界杯报名", "世界杯报名", "", worldCupPayment.getCode(),
                        worldCup.getCash().toString(), "/base/worldCup/aliPayWorldCupCallback");
                        worldCupPayment.getAmount().toString(), "/base/worldCup/aliPayWorldCupCallback");
            }
            //玩湃币
            if(payType == 3){
@@ -550,25 +593,43 @@
                BigDecimal multiply = new BigDecimal(num).multiply(new BigDecimal(worldCup.getClassHour()));
                String ids = paymentWorldCup.getIds();
                JSONArray jsonArray = JSON.parseArray(ids);
                List<DeductionClassHour> list = new ArrayList<>();


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

                for (int i = 0; i < jsonArray.size(); i++) {
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    Long id = jsonObject.getLong("id");
                    //是否是学员（0=否，1=是）
                    Integer isStudent = jsonObject.getInteger("isStudent");
                    if(0 == isStudent){
                        return ResultUtil.error("非学员无法使用课时报名");
                    }
                    List<CoursePackageOrderStudent> coursePackageOrderStudent = coursePackageOrderStudentClient.getCoursePackageOrderStudent(id.intValue());
                    int sum = coursePackageOrderStudent.stream().mapToInt(CoursePackageOrderStudent::getLaveClassHours).sum();
                    if(sum < worldCup.getClassHour()){
                        return ResultUtil.error("报名失败，课时不足，请续课！");
                    }
                }

                worldCupPayment.setAmount(multiply);
                worldCupPayment.setPayStatus(2);
                worldCupPayment.setPayTime(new Date());
                worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
                worldCupPaymentService.save(worldCupPayment);

                //添加报名明细
                for (int i = 0; i < jsonArray.size(); i++) {
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    Long id = jsonObject.getLong("id");
                    //是否是学员（0=否，1=是）
                    Integer isStudent = jsonObject.getInteger("isStudent");
                    List<DeductionClassHour> list = new ArrayList<>();
                    //构建扣减课时数据
                    Integer classHour = worldCup.getClassHour();
                    for (CoursePackageOrderStudent packageOrderStudent : coursePackageOrderStudent) {
                        Integer laveClassHours = packageOrderStudent.getLaveClassHours();
                        if(laveClassHours == 0){
                            continue;
                        }

                        DeductionClassHour deductionClassHour = new DeductionClassHour();
                        if(classHour.compareTo(laveClassHours) > 0){
@@ -578,6 +639,7 @@
                            deductionClassHour.setClassHour(laveClassHours);
                            deductionClassHour.setStudentId(packageOrderStudent.getStudentId());
                            deductionClassHour.setCoursePackageId(packageOrderStudent.getCoursePackageId());
                            packageOrderStudent.setLaveClassHours(0);
                            list.add(deductionClassHour);
                        }else{
                            //够扣除直接跳出进行下个学员
@@ -585,6 +647,7 @@
                            deductionClassHour.setClassHour(classHour);
                            deductionClassHour.setStudentId(packageOrderStudent.getStudentId());
                            deductionClassHour.setCoursePackageId(packageOrderStudent.getCoursePackageId());
                            packageOrderStudent.setLaveClassHours(laveClassHours - classHour);
                            list.add(deductionClassHour);
                            break;
                        }
@@ -604,29 +667,6 @@
                    worldCupPaymentParticipant.setAlreadyEntered(0);
                    worldCupPaymentParticipant.setCreateTime(new Date());
                    worldCupPaymentParticipant.setContent(JSON.toJSONString(deductionClassHourList1));
                    worldCupPaymentParticipantService.save(worldCupPaymentParticipant);
                }

                worldCupPayment.setAmount(multiply);
                worldCupPayment.setPayStatus(2);
                worldCupPayment.setPayTime(new Date());
                worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
                worldCupPaymentService.save(worldCupPayment);

                //添加报名明细
                for (int i = 0; i < jsonArray.size(); i++) {
                    JSONObject jsonObject = jsonArray.getJSONObject(i);
                    Long id = jsonObject.getLong("id");
                    //是否是学员（0=否，1=是）
                    Integer isStudent = jsonObject.getInteger("isStudent");

                    WorldCupPaymentParticipant worldCupPaymentParticipant = new WorldCupPaymentParticipant();
                    worldCupPaymentParticipant.setWorldCupId(paymentWorldCup.getId());
                    worldCupPaymentParticipant.setWorldCupPaymentId(worldCupPayment.getId());
                    worldCupPaymentParticipant.setAppUserId(paymentWorldCup.getUid());
                    worldCupPaymentParticipant.setParticipantType(isStudent == 0 ? 2 : 1);
                    worldCupPaymentParticipant.setParticipantId(id);
                    worldCupPaymentParticipant.setAlreadyEntered(0);
                    worldCupPaymentParticipantService.save(worldCupPaymentParticipant);
                }

@@ -674,8 +714,11 @@
    @Override
    public ResultUtil paymentWorldCupCallback(String code, String outTradeNo) {
        WorldCupPayment worldCupPayment = worldCupPaymentService.getOne(new QueryWrapper<WorldCupPayment>().eq("code", code));
        Integer worldCupId = worldCupPayment.getWorldCupId();
        worldCupPayment.setPayStatus(2);
        worldCupPayment.setPayOrderNo(outTradeNo);
        worldCupPayment.setPayTime(new Date());
        worldCupPayment.setWorldCupId(null);
        worldCupPaymentService.updateById(worldCupPayment);

        //添加报名明细
@@ -688,7 +731,7 @@
            Integer isStudent = jsonObject.getInteger("isStudent");

            WorldCupPaymentParticipant worldCupPaymentParticipant = new WorldCupPaymentParticipant();
            worldCupPaymentParticipant.setWorldCupId(worldCupPayment.getWorldCupId());
            worldCupPaymentParticipant.setWorldCupId(worldCupId);
            worldCupPaymentParticipant.setWorldCupPaymentId(worldCupPayment.getId());
            worldCupPaymentParticipant.setAppUserId(worldCupPayment.getAppUserId());
            worldCupPaymentParticipant.setParticipantType(isStudent == 0 ? 2 : 1);
@@ -734,22 +777,14 @@
     */
    @Override
    public void cancelWorldCupRefund(Integer id) {
        List<WorldCupPaymentParticipant> list = worldCupPaymentParticipantService.list(new QueryWrapper<WorldCupPaymentParticipant>()
                .eq("worldCupId", id).eq("alreadyEntered", 0));
        Set<Long> collect = list.stream().map(WorldCupPaymentParticipant::getWorldCupPaymentId).collect(Collectors.toSet());
        for (Long worldCupPaymentId : collect) {
        //免费除外
        List<WorldCupPayment> list2 = worldCupPaymentService.list(new QueryWrapper<WorldCupPayment>().eq("worldCupId", id)
                .ne("payType", 0).eq("payStatus", 2).eq("state", 1));
        for (WorldCupPayment worldCupPayment : list2) {
            List<WorldCupPaymentParticipant> list1 = worldCupPaymentParticipantService.list(new QueryWrapper<WorldCupPaymentParticipant>()
                    .eq("worldCupPaymentId", worldCupPaymentId).eq("alreadyEntered", 0));
            WorldCupPayment worldCupPayment = worldCupPaymentService.getById(worldCupPaymentId);
                    .eq("worldCupId", id).eq("worldCupPaymentId", worldCupPayment.getId()).eq("alreadyEntered", 0));
            //总支付金额
            BigDecimal multiply = worldCupPayment.getUnitPrice().multiply(new BigDecimal(list1.size()));
            //免费
            if(worldCupPayment.getPayType() == 0){
                worldCupPayment.setWorldCupId(null);
                worldCupPayment.setRefundOrderNo("");
                worldCupPayment.setRefundTime(new Date());
                worldCupPayment.setPayStatus(3);
                worldCupPaymentService.updateById(worldCupPayment);
            }
            //微信支付
            if(worldCupPayment.getPayType() == 1){
                Map<String, String> map = payMoneyUtil.wxRefund(worldCupPayment.getPayOrderNo(), worldCupPayment.getCode(),
@@ -757,6 +792,9 @@
                if(!"SUCCESS".equals(map.get("return_code"))){
                    System.err.println("-------------微信退款失败---------");
                    System.err.println(map.get("return_msg"));
                }else{
                    worldCupPayment.setRefundAmount(multiply);
                    worldCupPaymentService.updateById(worldCupPayment);
                }
            }
            //支付宝支付
@@ -772,6 +810,7 @@
                    worldCupPayment.setWorldCupId(null);
                    worldCupPayment.setRefundTime(new Date());
                    worldCupPayment.setRefundOrderNo(trade_no);
                    worldCupPayment.setRefundAmount(multiply);
                    worldCupPayment.setPayStatus(3);
                    worldCupPaymentService.updateById(worldCupPayment);
                }
@@ -785,13 +824,14 @@
                worldCupPayment.setWorldCupId(null);
                worldCupPayment.setRefundTime(new Date());
                worldCupPayment.setRefundOrderNo("");
                worldCupPayment.setRefundAmount(multiply);
                worldCupPayment.setPayStatus(3);
                worldCupPaymentService.updateById(worldCupPayment);
            }
            //课时支付
            if(worldCupPayment.getPayType() == 4){
                for (WorldCupPaymentParticipant worldCupPaymentParticipant : list1) {
                    String content = worldCupPaymentParticipant.getContent();
                for (WorldCupPaymentParticipant worldCupPaymentParticipant1 : list1) {
                    String content = worldCupPaymentParticipant1.getContent();
                    DeductionClassHourList deductionClassHourList = JSON.parseObject(content, DeductionClassHourList.class);
                    coursePackageOrderStudentClient.backspaceClassHour(deductionClassHourList);
                }
@@ -799,9 +839,15 @@
                worldCupPayment.setRefundTime(new Date());
                worldCupPayment.setRefundOrderNo("");
                worldCupPayment.setPayStatus(3);
                worldCupPayment.setRefundAmount(multiply);
                worldCupPaymentService.updateById(worldCupPayment);
            }

        }

        WorldCup worldCup = this.getById(id);
        worldCup.setStatus(4);
        this.updateById(worldCup);
    }