Merge remote-tracking branch 'origin/master'

liujie

2023-08-04 1f9d05fd255fbd21356dad37527c7d33fda4fb8b

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

@@ -81,7 +81,10 @@
     */
    @Override
    public List<CompetitionListVo> queryMyCompetitionList(Integer uid, Integer type, Integer pageSize, Integer pageNo) throws Exception {
        pageSize = (pageSize - 1) * pageNo;
        pageNo = (pageNo - 1) * pageSize;
        if(0 == type){
            type = null;
        }
        return this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
    }

@@ -115,8 +118,9 @@
        competitionInfo.setProvince(competition.getEntryProvince());
        competitionInfo.setCity(competition.getEntryCity());
        competitionInfo.setAddress(competition.getEntryAddress());
        competitionInfo.setPayType(competition.getPayType());
        competitionInfo.setPrice(competition.getPrice().doubleValue());
        competitionInfo.setCashPrice(competition.getCashPrice());
        competitionInfo.setPlayPaiCoin(competition.getPlayPaiCoin());
        competitionInfo.setClassPrice(competition.getClassPrice());
        competitionInfo.setIntroduction(competition.getIntroduction());
        competitionInfo.setRegistrationNotes(competition.getRegistrationNotes());
        competitionInfo.setApply(1);
@@ -135,6 +139,12 @@
            participant.add(participantVo);
        }
        competitionInfo.setParticipant(participant);
        competitionInfo.setStatus(competition.getStatus());
        if(paymentCompetition.getPayStatus() == 3){
            competitionInfo.setStatus(4);
        }
        competitionInfo.setPayMoney(paymentCompetition.getAmount());
        competitionInfo.setPayType(paymentCompetition.getPayType());
        return competitionInfo;
    }

@@ -179,6 +189,7 @@
            paymentCompetition.setRefundOrderNo(refund_id);
            paymentCompetition.setRefundTime(new Date());
            paymentCompetition.setPayStatus(3);
            paymentCompetition.setAppUserId(null);
            this.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -192,6 +203,7 @@
            paymentCompetition.setRefundOrderNo("");
            paymentCompetition.setRefundTime(new Date());
            paymentCompetition.setPayStatus(3);
            paymentCompetition.setAppUserId(null);
            this.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -204,7 +216,7 @@
                Student student = studentClient.queryStudentByPhone(participant.getPhone());
                PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
                paymentDeductionClassHour.setId(student.getId());
                paymentDeductionClassHour.setClassHour(competition.getPrice().intValue());
                paymentDeductionClassHour.setClassHour(competition.getClassPrice());
                paymentDeductionClassHour.setCode(code);
                coursePackagePaymentClient.rollbackPaymentDeductionClassHour(paymentDeductionClassHour);
            }
@@ -212,6 +224,7 @@
            paymentCompetition.setRefundOrderNo("");
            paymentCompetition.setRefundTime(new Date());
            paymentCompetition.setPayStatus(3);
            paymentCompetition.setAppUserId(null);
            this.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);