From c61fd86891748b47d3b1eae81be0a0c34203f8d7 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 23 十一月 2023 19:30:30 +0800
Subject: [PATCH] 11.23.2
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 9e47a70..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;
}
@@ -1074,9 +1093,13 @@
@ApiOperation(value = "已报名课程详情", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @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){
+ public ResultUtil<CourseDetailsResponse> getRegisteredData(Long coursePayId, String lon, String lat,Integer orderId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -1084,7 +1107,9 @@
}
return ResultUtil.success(packagePaymentService.queryRegisteredCourseDetails(coursePayId,appUserId));
}catch (Exception e){
- return ResultUtil.runErr();
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+// return ResultUtil.runErr();
}
}
@@ -1416,6 +1441,7 @@
for (CancelledClasses cancelledClasses : voucher) {
TCoursePackagePayment coursePackagePayment = packagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() + cancelledClasses.getCancelledClassesNumber());
+ coursePackagePayment.setAppUserId(null);
packagePaymentService.updateById(coursePackagePayment);
cancelledClassesService.removeById(cancelledClasses.getId());
@@ -2108,10 +2134,15 @@
HashMap<String, Object> weeksOfCourseDetailsList(@RequestBody CourseDetailReq courseDetailReq){
HashMap<String, Object> map = new HashMap<>();
ArrayList<DetailsListVo> objects = new ArrayList<>();
- try {
+// try {
String time = courseDetailReq.getTime();
- Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(time);
- int i = cn.hutool.core.date.DateUtil.dayOfWeek(parse)-1;
+ Date parse = null;
+ try {
+ parse = new SimpleDateFormat("yyyy-MM-dd").parse(time);
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ int i = cn.hutool.core.date.DateUtil.dayOfWeek(parse)-1;
String week = week(i);
Store store = sreClient.queryStoreById(courseDetailReq.getStoreId());
String lat = store.getLat();
@@ -2203,7 +2234,7 @@
List<CoursePackageStudent> list5 = cspsService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", courseDetailReq.getStuId()).eq("coursePackageId",tCoursePackage.getId()));
- if(list5.size()>0){
+ if(list5.size()>0&&list4.size()>0){
Integer signInOrNot = list4.get(0).getSignInOrNot();
detailsListVo.setType(1);
@@ -2258,10 +2289,10 @@
map.put("data",objects);
return map;
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return map;
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+// return map;
}
private String week(int i){
--
Gitblit v1.7.1