From 312cd22230809437aae8462d71d3335e6540f78a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 12 十二月 2023 08:54:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 160 +++++++++++++++++++++++++++--------------------------
1 files changed, 82 insertions(+), 78 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 899fbcf..dee116e 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -941,6 +941,7 @@
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
@@ -1023,7 +1024,7 @@
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
//生成支付订单
CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
- if (paymentCourseVo.getOrderId()==null) {
+ if (paymentCourseVo.getOrderId()==null){
coursePackageOrder.setCode(code);
coursePackageOrder.setAppUserId(uid);
coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
@@ -1036,6 +1037,7 @@
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
@@ -1138,6 +1140,7 @@
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(2);
coursePackageOrder.setPayUserId(appUser.getId());
+ coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
@@ -1339,7 +1342,7 @@
int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
//最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
- if(week.get(week.size() - 1).equals(day_week1) && week_of_month == week_of_month1){
+ if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
return;
}
}
@@ -1530,8 +1533,6 @@
Integer codeTime = coursePackage.getCodeTime();
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
- String format = sdf1.format(one.getClassDate());
- String time = format.substring(format.indexOf(" ") + 1);
String[] split = classStartTime.split(",");
String[] split1 = classEndTime.split(",");
@@ -1542,6 +1543,8 @@
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
}else{
+ String format = sdf1.format(one.getClassDate());
+ String time = format.substring(format.indexOf(" ") + 1);
int n = Arrays.asList(split).indexOf(time);
if(n != split.length - 1){
calendar.setTime(one.getClassDate());
@@ -1637,8 +1640,8 @@
packageScheduling.setStudentId(coursePackageOrderStudent.getStudentId());
packageScheduling.setCoursePackageId(coursePackage.getId());
try {
- Date parse = sdf.parse(sdf1.format(time1) + " " + split[j]);
- Date parse1 = sdf.parse(sdf1.format(time1) + " " + split1[j]);
+ Date parse = sdf1.parse(sdf.format(time1) + " " + split[j]);
+ Date parse1 = sdf1.parse(sdf.format(time1) + " " + split1[j]);
packageScheduling.setClassDate(parse);
packageScheduling.setEndDate(parse1);
}catch (Exception e){
@@ -1860,84 +1863,85 @@
*/
@Override
public void updateCoursePackageById(TCoursePackage coursePackage) {
- try {
- List<CoursePackageStudent> coursePackageStudents = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackage.getId()));
- List<Long> collect = coursePackageStudents.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
-
- QueryWrapper<CoursePackageScheduling> coursePackageSchedulingQueryWrapper = new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId());
- if (collect.size() > 0) {
- coursePackageSchedulingQueryWrapper.notIn("id", collect);
- }
- coursePackageSchedulingService.remove(coursePackageSchedulingQueryWrapper);
- int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", coursePackage.getId()));
- if (coursePackageId>0) {
+// try {
+// List<CoursePackageStudent> coursePackageStudents = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("coursePackageId", coursePackage.getId()));
+// List<Long> collect = coursePackageStudents.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
+//
+// QueryWrapper<CoursePackageScheduling> coursePackageSchedulingQueryWrapper = new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId());
+// if (collect.size() > 0) {
+// coursePackageSchedulingQueryWrapper.notIn("id", collect);
+// }
+// coursePackageSchedulingService.remove(coursePackageSchedulingQueryWrapper);
+// int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", coursePackage.getId()));
+// if (coursePackageId>0) {
this.baseMapper.updateById(coursePackage);
//生成排课数据
- Date date = null;
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId()).last(" and classDate > now() order by classDate desc limit 0, 1"));
- if (null != coursePackageScheduling) {
- date = sdf1.parse(sdf.format(coursePackageScheduling.getClassDate()) + " 00:00:00");
- } else {
- date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
- }
- List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
- String classStartTime = coursePackage.getClassStartTime();
- String[] split = classStartTime.split(":");
- String classEndTime = coursePackage.getClassEndTime();
- String[] split1 = classEndTime.split(":");
- Calendar s = Calendar.getInstance();
- s.setTime(date);
- s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
-
- Calendar e = Calendar.getInstance();
- e.setTime(date);
- if (null != coursePackageScheduling) {
- long time = sdf1.parse(sdf.format(new Date()) + " 00:00:00").getTime();
- int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
- e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
- } else {
- e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
- }
- long timeInMillis = e.getTimeInMillis();
-
- while (true) {
- int w = s.get(Calendar.DAY_OF_WEEK);
- WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
- if (list.contains(weekEnum.getChineseName())) {
- Calendar classDate = Calendar.getInstance();
- classDate.setTime(s.getTime());
- classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
- classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
- classDate.set(Calendar.SECOND, 0);
-
- Calendar endDate = Calendar.getInstance();
- endDate.setTime(s.getTime());
- endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
- endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
- endDate.set(Calendar.SECOND, 0);
-
- CoursePackageScheduling coursePackageScheduling1 = new CoursePackageScheduling();
- coursePackageScheduling1.setCoursePackageId(coursePackage.getId());
- coursePackageScheduling1.setClassDate(classDate.getTime());
- coursePackageScheduling1.setEndDate(endDate.getTime());
- coursePackageScheduling1.setStatus(1);
- coursePackageSchedulingService.save(coursePackageScheduling1);
- }
- s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
- if (s.getTimeInMillis() > timeInMillis) {
- break;
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+// Date date = null;
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+// SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.getOne(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackage.getId()).last(" and classDate > now() order by classDate desc limit 0, 1"));
+// if (null != coursePackageScheduling) {
+// date = sdf1.parse(sdf.format(coursePackageScheduling.getClassDate()) + " 00:00:00");
+// } else {
+// date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
+// }
+// List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
+// String classStartTime = coursePackage.getClassStartTime();
+// String[] split = classStartTime.split(":");
+// String classEndTime = coursePackage.getClassEndTime();
+// String[] split1 = classEndTime.split(":");
+// Calendar s = Calendar.getInstance();
+// s.setTime(date);
+// s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
+//
+// Calendar e = Calendar.getInstance();
+// e.setTime(date);
+// if (null != coursePackageScheduling) {
+// long time = sdf1.parse(sdf.format(new Date()) + " 00:00:00").getTime();
+// int d = Long.valueOf(14L - ((s.getTimeInMillis() - time) / 86400000L)).intValue();
+// e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + d);
+// } else {
+// e.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 14);
+// }
+// long timeInMillis = e.getTimeInMillis();
+//
+// while (true) {
+// int w = s.get(Calendar.DAY_OF_WEEK);
+// WeekEnum weekEnum = WeekEnum.getWeekEnum(w);
+// if (list.contains(weekEnum.getChineseName())) {
+// Calendar classDate = Calendar.getInstance();
+// classDate.setTime(s.getTime());
+// classDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+// classDate.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+// classDate.set(Calendar.SECOND, 0);
+//
+// Calendar endDate = Calendar.getInstance();
+// endDate.setTime(s.getTime());
+// endDate.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split1[0]));
+// endDate.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
+// endDate.set(Calendar.SECOND, 0);
+//
+// CoursePackageScheduling coursePackageScheduling1 = new CoursePackageScheduling();
+// coursePackageScheduling1.setCoursePackageId(coursePackage.getId());
+// coursePackageScheduling1.setClassDate(classDate.getTime());
+// coursePackageScheduling1.setEndDate(endDate.getTime());
+// coursePackageScheduling1.setStatus(1);
+// coursePackageSchedulingService.save(coursePackageScheduling1);
+// }
+// s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) + 1);
+// if (s.getTimeInMillis() > timeInMillis) {
+// break;
+// }
+// }
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
}
+
/**
* 获取课包审核列表
*
--
Gitblit v1.7.1