From 1aa309700fb7e12d85f98bed22a45bdac448ec1c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 16 九月 2023 11:18:46 +0800
Subject: [PATCH] app 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 779a7b7..3f62769 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
@@ -12,6 +12,7 @@
import com.dsh.competition.feignclient.account.model.Student;
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.PaymentCompetitionMapper;
@@ -81,7 +82,7 @@
*/
@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;
}
@@ -105,7 +106,7 @@
competitionInfo.setImgs(competition.getImgs());
competitionInfo.setName(competition.getName());
competitionInfo.setRegisterCondition(competition.getRegisterCondition());
- Store store = storeClient.queryStoreById(competition.getStoreId());
+ Store store = storeClient.queryStoreById(Integer.valueOf(competition.getStoreId().split(",")[0]));
competitionInfo.setStoreName(store.getName());
competitionInfo.setStoreAddress(store.getAddress());
competitionInfo.setStoreLon(store.getLon());
@@ -143,6 +144,8 @@
if(paymentCompetition.getPayStatus() == 3){
competitionInfo.setStatus(4);
}
+ competitionInfo.setPayMoney(paymentCompetition.getAmount());
+ competitionInfo.setPayType(paymentCompetition.getPayType());
return competitionInfo;
}
@@ -187,6 +190,7 @@
paymentCompetition.setRefundOrderNo(refund_id);
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -200,6 +204,7 @@
paymentCompetition.setRefundOrderNo("");
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -220,6 +225,7 @@
paymentCompetition.setRefundOrderNo("");
paymentCompetition.setRefundTime(new Date());
paymentCompetition.setPayStatus(3);
+ paymentCompetition.setAppUserId(null);
this.updateById(paymentCompetition);
competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
@@ -227,4 +233,14 @@
}
return ResultUtil.success();
}
+
+ @Override
+ public List<BillingRequest> queryDatas(Integer appUserId, String monthStart, String monthEnd) {
+ return this.baseMapper.queryDatas(appUserId,monthStart,monthEnd);
+ }
+
+ @Override
+ public List<BillingRequest> queryCancelDatas(Integer appUserId, String monthStart, String monthEnd) {
+ return this.baseMapper.queryCancelDatas(appUserId,monthStart,monthEnd);
+ }
}
--
Gitblit v1.7.1