Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java

@@ -10,11 +10,13 @@
import com.dsh.competition.feignclient.account.StudentClient;
import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.feignclient.account.model.Student;
import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
import com.dsh.competition.feignclient.model.BillingRequest;
import com.dsh.competition.feignclient.other.StoreClient;
import com.dsh.competition.feignclient.other.model.Store;
import com.dsh.competition.mapper.CompetitionMapper;
import com.dsh.competition.mapper.PaymentCompetitionMapper;
import com.dsh.competition.model.*;
import com.dsh.competition.service.CompetitionService;
@@ -30,10 +32,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -71,6 +70,8 @@



    @Resource
    private CompetitionMapper competitionMapper;

    /**
     * 获取我的报名赛事记录
@@ -87,7 +88,12 @@
        if(0 == type){
            type = null;
        }
        return this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
        List<CompetitionListVo> competitionListVos = this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
        for (CompetitionListVo competitionListVo : competitionListVos) {
            Integer counts =  competitionMapper.counts(competitionListVo.getPId());
            competitionListVo.setHeat(competitionListVo.getHeat()+counts);
        }
        return competitionListVos;
    }


@@ -119,13 +125,60 @@
        competitionInfo.setAge(competition.getStartAge() + "-" + competition.getEndAge());
        competitionInfo.setProvince(competition.getEntryProvince());
        competitionInfo.setCity(competition.getEntryCity());
        competitionInfo.setAddress(competition.getEntryAddress());

        String str = competition.getAddress();
        str = str.substring(str.indexOf("省") + 1);

        // 去掉第一个“市”及之前的字符串
        str = str.substring(str.indexOf("市") + 1);

        // 去掉第一个“区”及之前的字符串
        str = str.substring(str.indexOf("区") + 1);


        competitionInfo.setAddress(str);
        competitionInfo.setCashPrice(competition.getCashPrice());
        competitionInfo.setPlayPaiCoin(competition.getPlayPaiCoin());
        competitionInfo.setClassPrice(competition.getClassPrice());
        competitionInfo.setIntroduction(competition.getIntroduction());
        competitionInfo.setRegistrationNotes(competition.getRegistrationNotes());
        competitionInfo.setApply(1);
        ArrayList<Map<String,Object>> objects = new ArrayList<>();

        if(null != competition.getStoreId()){
            String storeId = competition.getStoreId();
            for (String s : storeId.split(",")) {
                HashMap<String, Object> map = new HashMap<>();
                Store store1 = storeClient.queryStoreById(Integer.valueOf(s));
                map.put("name",store1.getName());


                String str1 = store1.getAddress();
                str1 = str1.substring(str1.indexOf("省") + 1);

                // 去掉第一个“市”及之前的字符串
                str1 = str1.substring(str1.indexOf("市") + 1);

                // 去掉第一个“区”及之前的字符串
                str1 = str1.substring(str1.indexOf("区") + 1);

                map.put("address",str1);
                map.put("storeLon",store.getLon());
                map.put("storeLat",store.getLat());
                map.put("storeCoverDrawing",store.getCoverDrawing());
//                if(ToolUtil.isNotEmpty(lon) && ToolUtil.isNotEmpty(lat)){
//                    Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
//                    double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
//                    map.put("distance",wgs84);
//                }
                objects.add(map);
            }

        }
        competitionInfo.setStoreInfos(objects);



        List<ParticipantVo> participant = new ArrayList<>();
        List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
        List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
@@ -141,8 +194,26 @@
            participantVo.setIdcard(participant1.getIdcard());
            Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant1.getBirthday()));
            participantVo.setAge(age);
            participantVo.setPhone(participant1.getPhone());
            participant.add(participantVo);
        }


        for (Integer i : collect) {
            TStudent tStudent = studentClient.queryById(i);
            if (tStudent!=null) {
                ParticipantVo participantVo = new ParticipantVo();
                participantVo.setId(tStudent.getId());
                participantVo.setName(tStudent.getName());
                participantVo.setIdcard(tStudent.getIdCard());
                Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
                participantVo.setAge(age);
                participantVo.setPhone(tStudent.getPhone());
                participant.add(participantVo);
            }

        }

        competitionInfo.setParticipant(participant);
        competitionInfo.setStatus(competition.getStatus());
        if(paymentCompetition.getPayStatus() == 3){
@@ -221,10 +292,10 @@
        if(paymentCompetition.getPayType() == 4){//课程支付
            List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
            for (UserCompetition userCompetition : list) {
                Participant participant = participantService.getById(userCompetition.getId());
                Student student = studentClient.queryStudentByPhone(participant.getPhone());
//                Participant participant = participantService.getById(userCompetition.getId());
//                Student student = studentClient.queryStudentByPhone(participant.getPhone());
                PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
                paymentDeductionClassHour.setId(student.getId());
                paymentDeductionClassHour.setId(userCompetition.getParticipantId());
                paymentDeductionClassHour.setClassHour(competition.getClassPrice());
                paymentDeductionClassHour.setCode(code);
                coursePackagePaymentClient.rollbackPaymentDeductionClassHour(paymentDeductionClassHour);