修改bug

puzhibing

2024-03-15 b3e0d0ea6c1e311566bab861b79cc9b9c6d25287

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

@@ -120,7 +120,7 @@
     * @return
     */
    @Override
    public MyWorldCupInfo getMyWorldCupInfo(String id, String lon, String lat) {
    public MyWorldCupInfo getMyWorldCupInfo(Long id, String lon, String lat) {
        WorldCupPaymentParticipant worldCupPaymentParticipant = this.getById(id);
        Integer worldCupId = worldCupPaymentParticipant.getWorldCupId();
        WorldCupPayment worldCupPayment = worldCupPaymentService.getById(worldCupPaymentParticipant.getWorldCupPaymentId());
@@ -128,6 +128,7 @@
        WorldCup worldCup = worldCupService.getById(worldCupId);
        MyWorldCupInfo myWorldCupInfo = new MyWorldCupInfo();
        BeanUtils.copyProperties(worldCupInfo, myWorldCupInfo);
        myWorldCupInfo.setId(worldCupPaymentParticipant.getId());
        myWorldCupInfo.setUnitPrice(worldCupPayment.getUnitPrice().doubleValue());
        myWorldCupInfo.setExpense(worldCupPayment.getAmount().doubleValue());
        myWorldCupInfo.setStatus(worldCup.getStatus());
@@ -202,6 +203,24 @@
            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 myWorldCupInfo;
    }

@@ -217,8 +236,8 @@
                .eq("payStatus", 2).eq("state", 1));
        List<Long> collect = list.stream().map(WorldCupPayment::getId).collect(Collectors.toList());
        List<ParticipantVo> datas = new ArrayList<>();
        Set<Integer> csry = new HashSet<>();
        Set<Integer> xy = new HashSet<>();
        Set<Long> csry = new HashSet<>();
        Set<Long> xy = new HashSet<>();
        if(collect.size() > 0){
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
            List<WorldCupPaymentParticipant> list1 = this.list(new QueryWrapper<WorldCupPaymentParticipant>().in("worldCupPaymentId", collect));
@@ -239,6 +258,7 @@
                    participantVo.setPhone(tStudent.getPhone());
                    participantVo.setIsStudent(1);
                    datas.add(participantVo);
                    xy.add(participantId);
                }
                //参赛人员
                if(2 == participantType && !csry.contains(participantId)){
@@ -252,6 +272,7 @@
                    participantVo.setPhone(participant.getPhone());
                    participantVo.setIsStudent(0);
                    datas.add(participantVo);
                    csry.add(participantId);
                }
            }
        }