From 376ea9972dd1696f48f6951d69e2639c464e1972 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 23 十一月 2023 18:47:28 +0800
Subject: [PATCH] 11.23
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 751e029..778b672 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -458,9 +458,17 @@
.eq("appUserId",student.getAppUserId())
.eq("studentId",stuId).eq("payStatus",2));
+ Date date = new Date();
+
if (byUserId.size() > 0 ){
for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
+
+ if (tCoursePackagePayment.getUseTime()!=null) {
+ if (tCoursePackagePayment.getUseTime().after(date)) {
+ date = tCoursePackagePayment.getUseTime();
+ }
+ }
if (tCoursePackage.getType()==3){
continue;
}
@@ -477,6 +485,7 @@
}else {
resp.setIsAble(1);
}
+
if (tCoursePackagePayment.getUseTime()!=null){
// String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
// resp.setPeriodOfValidity(afterDayDate);
@@ -492,6 +501,16 @@
resps.add(resp);
}
}
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String str = sdf.format(date);
+
+ for (StuCourseResp resp : resps) {
+
+
+ resp.setPeriodOfValidity(str);
+ }
+
+
return resps;
}
@@ -1077,8 +1096,10 @@
@ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@ApiImplicitParam(name = "coursePayId" ,value = "课包记录id",dataType = "long"),
+ @ApiImplicitParam(name = "orderId" ,value = "订单id",dataType = "int")
+
})
- public ResultUtil<CourseDetailsResponse> getRegisteredData(Long coursePayId, String lon, String lat){
+ public ResultUtil<CourseDetailsResponse> getRegisteredData(Long coursePayId, String lon, String lat,Integer orderId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
--
Gitblit v1.7.1