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 | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 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 f1247fe..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;
@@ -19,6 +20,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -70,12 +73,12 @@
* @return
*/
@Override
- public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, Integer storeId, String name, Integer status, Integer state) {
+ public Page<Map<String, Object>> queryCoursePackageLists(String provinceCode, String cityCode, Integer coursePackageTypeId, List<Integer> storeId, String name, Integer status, Integer state) {
QueryCoursePackageLists queryCoursePackageLists = new QueryCoursePackageLists();
queryCoursePackageLists.setProvinceCode(provinceCode);
queryCoursePackageLists.setCityCode(cityCode);
queryCoursePackageLists.setCoursePackageTypeId(coursePackageTypeId);
- queryCoursePackageLists.setStoreId(storeId);
+ queryCoursePackageLists.setStoreIds(storeId);
queryCoursePackageLists.setName(name);
queryCoursePackageLists.setState(state);
queryCoursePackageLists.setStatus(status);
@@ -138,6 +141,35 @@
*/
@Override
public void updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig) {
+ String holitime = coursePackage.getHolitime();
+ 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());
JSONArray jsonArray = JSON.parseArray(coursePackagePaymentConfig);
@@ -285,7 +317,12 @@
coursePackageDiscount1.setCoursePackagePaymentConfigId(coursePackagePaymentConfigId);
coursePackageDiscount1.setType(type);
coursePackageDiscount1.setContent(cpd.getString("content"));
- coursePackageDiscount1.setAuditStatus(2);
+ if (UserExt.getUser().getObjectType() == 1){
+ coursePackageDiscount1.setAuditStatus(2);
+ }else if (UserExt.getUser().getObjectType() == 2){
+ coursePackageDiscount1.setAuditStatus(1);
+ }
+
coursePackageDiscount1.setInsertTime(new Date());
list.add(coursePackageDiscount1);
}
@@ -356,7 +393,6 @@
return coursePackageStudentClient.queryCoursePackageStudentList(queryCoursePackageStudentList);
}
-
/**
* 取消预约
* @param id
@@ -368,9 +404,19 @@
if(coursePackageStudent.getSignInOrNot() == 1){
return ResultUtil.error("无法取消预约");
}
+// TCoursePackagePayment payment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
+// payment.setAbsencesNumber(payment.getAbsencesNumber()+1);
+// coursePackagePaymentClient.editCoursePackagePayment(payment);
+
+
coursePackageStudent = new CoursePackageStudent();
coursePackageStudent.setId(id);
coursePackageStudent.setReservationStatus(0);
+
+
+
+ coursePackageStudent.getCoursePackagePaymentId();
+
coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
return ResultUtil.success();
}
@@ -408,7 +454,7 @@
}
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(id);
if(coursePackageStudents.size() > 0){
- return ResultUtil.error("不能取消本次");
+// return ResultUtil.error("不能取消本次");
}
coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setId(id);
@@ -438,6 +484,7 @@
}
+
/**
* 上传消课凭证
* @param id
@@ -447,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("不能添加消课凭证");
}
@@ -470,11 +522,11 @@
tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
}
- if(coursePackageStudent.getSignInOrNot() == 0){
+ if(coursePackageStudent.getReservationStatus() == 0){
tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
}
System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
- coursePackagePaymentClient.editCoursePackagePayment(tCoursePackagePayment);
+ coursePackagePaymentClient.editCoursePackagePayment1(tCoursePackagePayment);
CancelledClasses cancelledClasses = new CancelledClasses();
cancelledClasses.setType(1);
@@ -486,7 +538,15 @@
cancelledClasses.setCancelledClassesNumber(deductClassHour);}
cancelledClasses.setInsertTime(new Date());
cancelledClassesClient.addCancelledClasses(cancelledClasses);
+
+
+
+
+
+
}
+ }
+
return ResultUtil.success();
}
--
Gitblit v1.7.1