From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index bb9f556..a555213 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -9,6 +9,7 @@
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.support.HttpKit;
import com.dsh.guns.core.util.ToolUtil;
+import com.dsh.guns.modular.system.model.CourseCounsum;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.ICoursePackageService;
import com.dsh.guns.modular.system.service.IStoreService;
@@ -141,24 +142,33 @@
@Override
public void updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig) {
String holitime = coursePackage.getHolitime();
- String[] split = holitime.split(" - ");
- String startTime = split[0];
- String endTime = split[1];
- SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
- try {
- Date parse1 = format1.parse(startTime);
- parse1.setHours(0);
- parse1.setMinutes(0);
- parse1.setSeconds(0);
- Date parse2 = format2.parse(endTime);
- parse2.setHours(23);
- parse2.setMinutes(59);
- parse2.setSeconds(59);
- coursePackage.setStartTime(parse1);
- coursePackage.setEndTime(parse2);
- } catch (ParseException e) {
- e.printStackTrace();
+ if (holitime!=null){
+ // 如果为空字符串 则默认未修改
+ if (holitime.equals("")){
+ TCoursePackage tCoursePackage = coursePackageClient.queryById(coursePackage.getId());
+ coursePackage.setStartTime(tCoursePackage.getStartTime());
+ coursePackage.setEndTime(tCoursePackage.getEndTime());
+ }else{
+ String[] split = holitime.split(" - ");
+ String startTime = split[0];
+ String endTime = split[1];
+ SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ Date parse1 = format1.parse(startTime);
+ parse1.setHours(0);
+ parse1.setMinutes(0);
+ parse1.setSeconds(0);
+ Date parse2 = format2.parse(endTime);
+ parse2.setHours(23);
+ parse2.setMinutes(59);
+ parse2.setSeconds(59);
+ coursePackage.setStartTime(parse1);
+ coursePackage.setEndTime(parse2);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
}
coursePackageClient.updateCoursePackage(coursePackage);
coursePackagePaymentConfigClient.delCoursePackagePaymentConfig(coursePackage.getId());
@@ -474,6 +484,7 @@
}
+
/**
* 上传消课凭证
* @param id
@@ -483,7 +494,12 @@
*/
@Override
public ResultUtil cancellationRecord(Long id, String cancelClasses, Integer deductClassHour) {
- CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
+// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
+
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
+
+ for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
+
if(coursePackageScheduling.getStatus() == 1 || coursePackageScheduling.getStatus() == 4){
return ResultUtil.error("不能添加消课凭证");
}
@@ -522,7 +538,15 @@
cancelledClasses.setCancelledClassesNumber(deductClassHour);}
cancelledClasses.setInsertTime(new Date());
cancelledClassesClient.addCancelledClasses(cancelledClasses);
+
+
+
+
+
+
}
+ }
+
return ResultUtil.success();
}
--
Gitblit v1.7.1