From 1f9d05fd255fbd21356dad37527c7d33fda4fb8b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 04 八月 2023 17:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index c2e3036..7a8211f 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/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);
@@ -139,6 +143,8 @@
if(paymentCompetition.getPayStatus() == 3){
competitionInfo.setStatus(4);
}
+ competitionInfo.setPayMoney(paymentCompetition.getAmount());
+ competitionInfo.setPayType(paymentCompetition.getPayType());
return competitionInfo;
}
@@ -183,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);
@@ -196,6 +203,7 @@
paymentCompetition.setRefundOrderNo("");
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -208,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);
}
@@ -216,6 +224,7 @@
paymentCompetition.setRefundOrderNo("");
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
--
Gitblit v1.7.1