From 4146ce356365a67fec0509d64ebcf52f74c7ade9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 27 九月 2023 11:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 964604b..49b711f 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -41,6 +41,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -131,6 +132,22 @@
list.add(value);
}
return cpConfigMapper.changeState(list,dto.getPayUserName(),dto.getUserId());
+ }
+
+ @Override
+ public void updateBytime(TCoursePackagePayment coursePackagePayment) {
+ this.baseMapper.updateBytime(coursePackagePayment);
+ }
+
+ @Override
+ public List<RegisterOrderVO> listAllRegister(RegisterOrderQuery query) {
+ String STime = null;
+ String ETime = null;
+ if (StringUtils.hasLength(query.getRegisterTime())) {
+ STime = query.getRegisterTime().split(" - ")[0] + " 00:00:00";
+ ETime = query.getRegisterTime().split(" - ")[1] + " 23:59:59";
+ }
+ return cpConfigMapper.listAllRegister(query,STime,ETime,query.getAmount());
}
/**
@@ -991,7 +1008,7 @@
student1.setCoursePackageId(tCoursePackage.getId());
student1.setCoursePackagePaymentId(tCoursePackagePayment1.getId());
student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
- student1.setSignInOrNot(0);
+ student1.setSignInOrNot(1);
student1.setReservationStatus(1);
student1.setInsertTime(new Date());
student1.setType(1);
--
Gitblit v1.7.1