From 2386300f1ed591e6c46b7f32539cac7f2fd7d434 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 七月 2023 08:58:31 +0800
Subject: [PATCH] 更新预约场地部分接口
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..779a7b7 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
@@ -82,6 +82,9 @@
@Override
public List<CompetitionListVo> queryMyCompetitionList(Integer uid, Integer type, Integer pageSize, Integer pageNo) throws Exception {
pageSize = (pageSize - 1) * pageNo;
+ 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);
@@ -208,7 +212,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);
}
--
Gitblit v1.7.1