From be8a63ba1e3f2e26f5cdefe519c37ad4cfd90435 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期日, 05 十一月 2023 09:45:11 +0800
Subject: [PATCH] 11.5
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 994cab8..b736e77 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
@@ -70,12 +70,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);
@@ -108,11 +108,13 @@
Integer classHours = jsonObject.getInteger("classHours");
Double cashPayment = jsonObject.getDouble("cashPayment");
Integer playPaiCoin = jsonObject.getInteger("playPaiCoin");
+ String couponIds = jsonObject.getString("couponIds");
CoursePackagePaymentConfig coursePackagePaymentConfig1 = new CoursePackagePaymentConfig();
coursePackagePaymentConfig1.setCoursePackageId(integer);
coursePackagePaymentConfig1.setClassHours(classHours);
coursePackagePaymentConfig1.setCashPayment(cashPayment);
coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin);
+ coursePackagePaymentConfig1.setCouponIds(couponIds);
coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
}
}
@@ -144,11 +146,13 @@
Integer classHours = jsonObject.getInteger("classHours");
Double cashPayment = jsonObject.getDouble("cashPayment");
Integer playPaiCoin = jsonObject.getInteger("playPaiCoin");
+ String couponIds = jsonObject.getString("couponIds");
CoursePackagePaymentConfig coursePackagePaymentConfig1 = new CoursePackagePaymentConfig();
coursePackagePaymentConfig1.setCoursePackageId(coursePackage.getId());
coursePackagePaymentConfig1.setClassHours(classHours);
coursePackagePaymentConfig1.setCashPayment(cashPayment);
coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin);
+ coursePackagePaymentConfig1.setCouponIds(couponIds);
coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
}
}
@@ -281,7 +285,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);
}
@@ -352,7 +361,6 @@
return coursePackageStudentClient.queryCoursePackageStudentList(queryCoursePackageStudentList);
}
-
/**
* 取消预约
* @param id
@@ -364,9 +372,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();
}
@@ -404,7 +422,7 @@
}
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(id);
if(coursePackageStudents.size() > 0){
- return ResultUtil.error("不能取消本次");
+// return ResultUtil.error("不能取消本次");
}
coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setId(id);
@@ -457,11 +475,20 @@
continue;
}
TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
- tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
- if(coursePackageStudent.getSignInOrNot() == 0){
+
+ if (deductClassHour!=null) {
+ if (tCoursePackagePayment.getLaveClassHours() - deductClassHour < 0) {
+ coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
+ continue;
+ }
+ tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
+ }
+
+ if(coursePackageStudent.getReservationStatus() == 0){
tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
}
- coursePackagePaymentClient.editCoursePackagePayment(tCoursePackagePayment);
+ System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
+ coursePackagePaymentClient.editCoursePackagePayment1(tCoursePackagePayment);
CancelledClasses cancelledClasses = new CancelledClasses();
cancelledClasses.setType(1);
@@ -469,7 +496,8 @@
cancelledClasses.setCoursePackagePaymentId(coursePackageStudent.getCoursePackagePaymentId());
cancelledClasses.setCoursePackageSchedulingId(coursePackageStudent.getCoursePackageSchedulingId());
cancelledClasses.setVoucher(cancelClasses);
- cancelledClasses.setCancelledClassesNumber(deductClassHour);
+ if (deductClassHour!=null) {
+ cancelledClasses.setCancelledClassesNumber(deductClassHour);}
cancelledClasses.setInsertTime(new Date());
cancelledClassesClient.addCancelledClasses(cancelledClasses);
}
@@ -576,6 +604,7 @@
@Override
public ResultUtil makeUpMissedLessons(Long coursePackagePaymentId) {
TCoursePackagePayment coursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackagePaymentId);
+ System.out.println("=========coursePackagePayment=====>"+coursePackagePayment);
if(coursePackagePayment.getStatus() == 2){
return ResultUtil.error("该学员已退课");
}
--
Gitblit v1.7.1