From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +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/controller/CourseStudentController.java | 335 +++++++++++++++++++++++++++----------------------------
1 files changed, 165 insertions(+), 170 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index b8f931c..f3ad740 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -41,7 +41,7 @@
@RequestMapping("/courdent")
public class CourseStudentController {
@Autowired
- CoursePackageStudentService studentService ;
+ CoursePackageStudentService studentService;
@Autowired
TCoursePackagePaymentService paymentService;
@Autowired
@@ -50,12 +50,13 @@
private TCoursePackageService coursePackageService;
@Resource
private CoursePackageStudentMapper cpsMapper;
+
//获取退费记录
@RequestMapping("/getRefund")
@ResponseBody
public List<MoneyBack> getRefund() {
// 查询已通过申请的退费记录
- return counsumService.getRefund();
+ return counsumService.getRefund();
}
@@ -63,16 +64,14 @@
private CoursePackageSchedulingMapper coursePackageSchedulingService;
-
-
@RequestMapping("/getStudentTotal")
@ResponseBody
public List<Map<String, Object>> get(@RequestBody StudentQeryDto studentQeryDto) {
- System.out.println("-====studentQeryDto========="+studentQeryDto);
- List<Map<String, Object>> pays = paymentService.getStudentTotal(studentQeryDto);
- System.out.println("=========pays======"+pays);
+ System.out.println("-====studentQeryDto=========" + studentQeryDto);
+ List<Map<String, Object>> pays = paymentService.getStudentTotal(studentQeryDto);
+ System.out.println("=========pays======" + pays);
- return pays;
+ return pays;
}
@@ -80,28 +79,28 @@
@RequestMapping("/bypac")
@ResponseBody
public List<Map<String, Object>> bypac(@RequestBody PacQueryDto pacQueryDto) {
- System.out.println("-====studentQeryDto========="+pacQueryDto);
- if (pacQueryDto.getStoreIds()!=null && pacQueryDto.getStoreIds().size()!=0){
+ System.out.println("-====studentQeryDto=========" + pacQueryDto);
+ if (pacQueryDto.getStoreIds() != null && pacQueryDto.getStoreIds().size() != 0) {
// 根据门店id 查询课包ids
List<Integer> coursePackageIds = coursePackageService.list(new QueryWrapper<TCoursePackage>()
.in("storeId", pacQueryDto.getStoreIds())).stream()
.map(TCoursePackage::getId).collect(Collectors.toList());
pacQueryDto.setStoreIds(coursePackageIds);
}
- List<Map<String, Object>> pays = paymentService.bypac(pacQueryDto);
+ List<Map<String, Object>> pays = paymentService.bypac(pacQueryDto);
- System.out.println("=========pays======"+pays);
+ System.out.println("=========pays======" + pays);
- return pays;
+ return pays;
}
@ResponseBody
@PostMapping("/queryIdsByStore")
- public List<Integer> queryIdsByStore(@RequestBody Integer objectId){
+ public List<Integer> queryIdsByStore(@RequestBody Integer objectId) {
List<TCoursePackage> list = packageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, objectId));
List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
- if(collect.size()==0){
+ if (collect.size() == 0) {
collect.add(-1);
}
return collect;
@@ -111,7 +110,7 @@
//获取学员课时数信息
@RequestMapping("/getInfo")
@ResponseBody
- public StudentClassInfo list(@RequestParam("tStudentId")Integer tStudentId) {
+ public StudentClassInfo list(@RequestParam("tStudentId") Integer tStudentId) {
// System.out.println("------------>"+tStudentId);
@@ -122,99 +121,100 @@
Date minDate = studentService.getMinDate(tStudentId);
Integer totalHours = studentClassInfo.getTotalHours();
Integer hasHours = studentClassInfo.getRestHours();
- Integer restHours = totalHours-hasHours;
+ Integer restHours = totalHours - hasHours;
studentClassInfo.setHasHours(restHours);
studentClassInfo.setInDate(minDate);
- System.out.println("===========>"+studentClassInfo);
+ System.out.println("===========>" + studentClassInfo);
return studentClassInfo;
}
+
//获取学员课程列表
@RequestMapping("/getClassList")
@ResponseBody
- public List<ClassListDto> listClass(@RequestParam("tStudentId")Integer tStudentId) {
- System.out.println("==========getClassList===tStudentId===="+tStudentId);
- List<ClassListDto> listDtos = studentService.getClassList(tStudentId);
- for (ClassListDto dto : listDtos){
- dto.setHasClassHours(dto.getTotalClassHours()-dto.getLaveClassHours());
- }
- System.out.println("======listDtos======"+listDtos);
- return listDtos;
+ public List<ClassListDto> listClass(@RequestParam("tStudentId") Integer tStudentId) {
+ System.out.println("==========getClassList===tStudentId====" + tStudentId);
+ List<ClassListDto> listDtos = studentService.getClassList(tStudentId);
+ for (ClassListDto dto : listDtos) {
+ dto.setHasClassHours(dto.getTotalClassHours() - dto.getLaveClassHours());
+ }
+ System.out.println("======listDtos======" + listDtos);
+ return listDtos;
}
//获取学员有效期
@RequestMapping("/getUseTime")
@ResponseBody
- public Date getUseTime(@RequestParam("tStudentId")Integer tStudentId) {
- Date maxDate = studentService.getMaxDate(tStudentId);
+ public Date getUseTime(@RequestParam("tStudentId") Integer tStudentId) {
+ Date maxDate = studentService.getMaxDate(tStudentId);
- return maxDate;
+ return maxDate;
}
//批量修改有效期
@RequestMapping("/updateUseDate")
@ResponseBody
- public void updateUseDate(@RequestBody updateTimeDto updateTimeDto ){
- System.out.println("=========updateUseDate=====>="+updateTimeDto);
+ public void updateUseDate(@RequestBody updateTimeDto updateTimeDto) {
+ System.out.println("=========updateUseDate=====>=" + updateTimeDto);
List<TCoursePackagePayment> paymentList = paymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("studentId", updateTimeDto.getTStudentId()));
- System.out.println("=========paymentList=====>="+paymentList);
+ System.out.println("=========paymentList=====>=" + paymentList);
- for (TCoursePackagePayment payment: paymentList) {
+ for (TCoursePackagePayment payment : paymentList) {
// payment.setUseTime(updateTimeDto.getDate());
- paymentService.updateUseTime(payment.getId(),updateTimeDto.getDate());
+ paymentService.updateUseTime(payment.getId(), updateTimeDto.getDate());
}
- System.out.println("=======updateUseDate=======>"+paymentList);
+ System.out.println("=======updateUseDate=======>" + paymentList);
}
+
@Resource
private AppUserClient appUserClient;
+
//获取可转移学员
@RequestMapping("/getSelect")
@ResponseBody
- public List<SelectDto> getSelect(@RequestParam("payId")Long payId){
+ public List<SelectDto> getSelect(@RequestParam("payId") Long payId) {
TCoursePackagePayment byId = paymentService.getById(payId);
- List<Integer> studentIds = paymentService.getStudentIds(payId,byId.getCoursePackageId(),byId.getAppUserId());
- System.out.println("=========studentIds=================>"+studentIds);
+ List<Integer> studentIds = paymentService.getStudentIds(payId, byId.getCoursePackageId(), byId.getAppUserId());
+ System.out.println("=========studentIds=================>" + studentIds);
- if (studentIds.size()>0){
- List<SelectDto> selectDtos = appUserClient.getSelects(studentIds);
+ if (studentIds.size() > 0) {
+ List<SelectDto> selectDtos = appUserClient.getSelects(studentIds);
- return selectDtos;}
- else return null;
+ return selectDtos;
+ } else return null;
}
-
//根据payid获取对应门店的常规课程
@Autowired
- private TCoursePackageService packageService;
+ private TCoursePackageService packageService;
+
@RequestMapping("/holiSelect")
@ResponseBody
- public List<SelectDto> getHoliSelect(@RequestParam("courseId")Integer id){
+ public List<SelectDto> getHoliSelect(@RequestParam("courseId") Integer id) {
TCoursePackage byId = packageService.getById(id);
Integer storeId = byId.getStoreId();
List<TCoursePackage> list = packageService.list(new QueryWrapper<TCoursePackage>()
.select("id", "name")
.eq("storeId", storeId)
- .eq("type","2")
+ .eq("type", "2")
);
List<SelectDto> selectDtos = new ArrayList<>();
- for (TCoursePackage t :list){
+ for (TCoursePackage t : list) {
SelectDto selectDto = new SelectDto();
selectDto.setId(t.getId());
selectDto.setValue(t.getName());
selectDtos.add(selectDto);
}
-
-
return selectDtos;
@@ -222,24 +222,22 @@
@RequestMapping("/transSelect")
@ResponseBody
- public List<SelectDto> getTransSelect(@RequestParam("courseId")Integer id){
+ public List<SelectDto> getTransSelect(@RequestParam("courseId") Integer id) {
TCoursePackage byId = packageService.getById(id);
Integer storeId = byId.getStoreId();
List<TCoursePackage> list = packageService.list(new QueryWrapper<TCoursePackage>()
.select("id", "name")
.eq("storeId", storeId)
- .eq("type","1").ne("id",id)
+ .eq("type", "1").ne("id", id)
);
List<SelectDto> selectDtos = new ArrayList<>();
- for (TCoursePackage t :list){
+ for (TCoursePackage t : list) {
SelectDto selectDto = new SelectDto();
selectDto.setId(t.getId());
selectDto.setValue(t.getName());
selectDtos.add(selectDto);
}
-
-
return selectDtos;
@@ -248,20 +246,20 @@
@RequestMapping("/queryCounsum")
@ResponseBody
- public List<CourseCounsum> queryCounsum(@RequestBody ConsumeQuery consumeQuery){
- System.out.println("======queryCounsum==========="+consumeQuery);
+ public List<CourseCounsum> queryCounsum(@RequestBody ConsumeQuery consumeQuery) {
+ System.out.println("======queryCounsum===========" + consumeQuery);
QueryWrapper<CourseCounsum> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("paymentId",consumeQuery.getPayId());
+ queryWrapper.eq("paymentId", consumeQuery.getPayId());
- if (consumeQuery.getChangeType()!=null){
+ if (consumeQuery.getChangeType() != null) {
queryWrapper.eq("changeType", consumeQuery.getChangeType());
}
- if (consumeQuery.getStart()!=null){
+ if (consumeQuery.getStart() != null) {
queryWrapper.between("insertTime", consumeQuery.getStart(), consumeQuery.getEnd());
}
- if (consumeQuery.getReason()!=null&&consumeQuery.getReason()!=""){
+ if (consumeQuery.getReason() != null && consumeQuery.getReason() != "") {
queryWrapper.like("reason", consumeQuery.getReason());
}
@@ -271,9 +269,12 @@
}
+ @Autowired
+ private ICoursePackageOrderStudentService orderStudentService;
+
@RequestMapping("/insertBack")
@ResponseBody
- public void insertBack(@RequestBody InsertBackDto insertBackDto){
+ public void insertBack(@RequestBody InsertBackDto insertBackDto) {
MoneyBack moneyBack = new MoneyBack();
moneyBack.setStudentId(insertBackDto.getId());
@@ -282,31 +283,32 @@
moneyBack.setIds(insertBackDto.getIds());
moneyBackService.save(moneyBack);
- List<TCoursePackagePayment> pays = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", insertBackDto.getIds()));
- for (TCoursePackagePayment o :pays){
+// List<TCoursePackagePayment> pays = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", insertBackDto.getIds()));
+
+
+ List<CoursePackageOrderStudent> pays = orderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", insertBackDto.getIds()));
+ for (CoursePackageOrderStudent o : pays) {
o.setStatus(4);
o.setAppUserId(null);
}
-
-
- paymentService.updateBatchById(pays);
+ orderStudentService.updateBatchById(pays);
}
@RequestMapping("/queryByIds")
@ResponseBody
- public List<TCoursePackagePayment> queryByIds(@RequestParam("ids")String ids){
+ public List<TCoursePackagePayment> queryByIds(@RequestParam("ids") String ids) {
List<TCoursePackagePayment> paymentList = paymentService.list(new QueryWrapper<TCoursePackagePayment>()
.in("id", Arrays.asList(ids.split(","))));
- System.out.println("========client==>"+paymentList);
+ System.out.println("========client==>" + paymentList);
return paymentList;
}
@RequestMapping("/changeStatus")
@ResponseBody
- public void changeStatus(@RequestParam("id")Integer id){
+ public void changeStatus(@RequestParam("id") Integer id) {
MoneyBack byId = moneyBackService.getById(id);
byId.setStatus(1);
moneyBackService.updateById(byId);
@@ -315,21 +317,28 @@
@RequestMapping("/noStatus")
@ResponseBody
- public void noStatus(@RequestParam("id")Integer id){
+ public void noStatus(@RequestParam("id") Integer id) {
MoneyBack byId = moneyBackService.getById(id);
byId.setStatus(2);
moneyBackService.updateById(byId);
+
+ List<CoursePackageOrderStudent> pays = orderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>().in("id", byId.getIds()));
+ for (CoursePackageOrderStudent o : pays) {
+ o.setStatus(1);
+ o.setAppUserId(null);
+ }
+ orderStudentService.updateBatchById(pays);
}
@RequestMapping("/zeroClass")
@ResponseBody
- public void zeroClass(@RequestParam("id")Integer id){
+ public void zeroClass(@RequestParam("id") Integer id) {
MoneyBack byId = moneyBackService.getById(id);
String[] split2 = byId.getIds().split(",");
- System.out.println("========split===>"+split2);
+ System.out.println("========split===>" + split2);
List<TCoursePackagePayment> id1 = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", split2));
- for (TCoursePackagePayment o :id1){
+ for (TCoursePackagePayment o : id1) {
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setNum(o.getLaveClassHours());
courseCounsum.setChangeType(0);
@@ -344,7 +353,6 @@
o.setAppUserId(null);
-
TCoursePackage tCoursePackage = packageService.getById(o.getCoursePackageId());
String classWeeks = tCoursePackage.getClassWeeks();
List<Integer> week = week(classWeeks);
@@ -355,14 +363,13 @@
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
// 本周周几
- List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId",o.getStudentId()).eq("coursePackageId", o.getCoursePackageId()));
+ List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", o.getStudentId()).eq("coursePackageId", o.getCoursePackageId()));
List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//拿到最后一天的排课记录
- if (collect.size()>0) {
+ if (collect.size() > 0) {
coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", o.getStudentId()).eq("coursePackageId", o.getCoursePackageId()));
}
-
}
@@ -372,26 +379,27 @@
@RequestMapping("/backStausClass")
@ResponseBody
- public void backStausClass(@RequestParam("id")Integer id){
+ public void backStausClass(@RequestParam("id") Integer id) {
MoneyBack byId = moneyBackService.getById(id);
String[] split = byId.getIds().split(",");
- System.out.println("========split===>"+split);
+ System.out.println("========split===>" + split);
List<TCoursePackagePayment> id1 = paymentService.list(new QueryWrapper<TCoursePackagePayment>().in("id", split));
- for (TCoursePackagePayment o :id1){
+ for (TCoursePackagePayment o : id1) {
o.setStatus(1);
o.setAppUserId(null);
}
paymentService.updateBatchById(id1);
}
+
@RequestMapping("/cancel")
@ResponseBody
- public void cancel(@RequestParam("ids")String ids){
+ public void cancel(@RequestParam("ids") String ids) {
String[] split = ids.split(",");
List<CoursePackageStudent> coursePackagePaymentId = studentService.list(new QueryWrapper<CoursePackageStudent>().in("coursePackagePaymentId", split));
- for (CoursePackageStudent student :coursePackagePaymentId){
- student.setReservationStatus(3);
- student.setAppUserId(null);
- }
+ for (CoursePackageStudent student : coursePackagePaymentId) {
+ student.setReservationStatus(3);
+ student.setAppUserId(null);
+ }
studentService.updateBatchById(coursePackagePaymentId);
@@ -399,9 +407,10 @@
@Autowired
private MoneyBackService moneyBackService;
+
@RequestMapping("/getMoneyBack")
@ResponseBody
- public List<MoneyBack> getMoneyBack(@RequestParam("tStudentId")Integer tStudentId){
+ public List<MoneyBack> getMoneyBack(@RequestParam("tStudentId") Integer tStudentId) {
List<MoneyBack> moneyBacksck = moneyBackService.list(new QueryWrapper<MoneyBack>().eq("studentId", tStudentId));
return moneyBacksck;
@@ -411,14 +420,14 @@
@RequestMapping("/toClass")
@ResponseBody
public void toClass(@RequestBody ToClassDto toClassDto) throws ParseException {
- System.out.println("===========到达getSelect======="+toClassDto);
+ System.out.println("===========到达getSelect=======" + toClassDto);
TCoursePackagePayment orinPay =
paymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", toClassDto.getId()));
TCoursePackagePayment studentPay = paymentService.getOne
(new QueryWrapper<TCoursePackagePayment>()
.eq("studentId", toClassDto.getToStudentId())
- .eq("coursePackageId",orinPay.getCoursePackageId()));
- if (studentPay!=null) {
+ .eq("coursePackageId", orinPay.getCoursePackageId()));
+ if (studentPay != null) {
System.out.println("======orinPay=====>" + orinPay);
System.out.println("======studentPay=====>" + studentPay);
Integer laveClassHours = orinPay.getLaveClassHours();
@@ -432,15 +441,16 @@
List<CoursePackageStudent> studentCourse1 = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId()));
List<Long> collect1 = studentCourse1.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//拿到最后一天的排课记录
- if (collect1.size()>0){
+ if (collect1.size() > 0) {
coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect1));
coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", studentPay.getCoursePackageId()));
}
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setInsertTime(new Date());
- if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
+ if (orinPay.getAppUserId() != studentPay.getAppUserId()) {
courseCounsum.setReason("课时转移");
- }else { courseCounsum.setReason("课时转移");
+ } else {
+ courseCounsum.setReason("课时转移");
}
courseCounsum.setNum(laveClassHours);
courseCounsum.setChangeType(0);
@@ -459,9 +469,10 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
- if (orinPay.getAppUserId()!=studentPay.getAppUserId()){
+ if (orinPay.getAppUserId() != studentPay.getAppUserId()) {
courseCounsum1.setReason("课时转移");
- }else { courseCounsum1.setReason("课时转移");
+ } else {
+ courseCounsum1.setReason("课时转移");
}
courseCounsum1.setNum(laveClassHours);
courseCounsum1.setChangeType(1);
@@ -483,7 +494,7 @@
List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", studentPay.getCoursePackageId()));
List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//拿到最后一天的排课记录
- if (collect.size()>0) {
+ if (collect.size() > 0) {
coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", studentPay.getCoursePackageId()));
}
@@ -491,8 +502,6 @@
Student student = studentClient.queryStudentById(toClassDto.getToStudentId());
Date today = new Date();
-
-
TCoursePackagePayment pay = coursePackagePaymentService.getById(studentPay.getId());
@@ -503,17 +512,17 @@
// 本周周几
// int i = DateUtil.dayOfWeek(new Date())-1;
- Date[] dates = generateDateArray(14,today);
- can = laveClassHours2/codeTime;
+ Date[] dates = generateDateArray(14, today);
+ can = laveClassHours2 / codeTime;
for (Date date : dates) {
- if (count==can){
+ if (count == can) {
break;
}
- int wei = DateUtil.dayOfWeek(date);
- if (week.contains(wei)){
+ int wei = DateUtil.dayOfWeek(date);
+ if (week.contains(wei)) {
for (int i1 = 0; i1 < split.length; i1++) {
- if (count==can){
+ if (count == can) {
break;
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
@@ -540,8 +549,7 @@
}
- }else {
-
+ } else {
Student student = studentClient.queryStudentById(toClassDto.getToStudentId());
@@ -558,7 +566,6 @@
paymentService.save(to);
-
orinPay.setTotalClassHours(0);
orinPay.setLaveClassHours(0);
orinPay.setAppUserId(null);
@@ -566,12 +573,11 @@
paymentService.updateById(orinPay);
-
//删除orin的排课记录
List<CoursePackageStudent> studentCourse1 = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId()));
List<Long> collect1 = studentCourse1.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//拿到最后一天的排课记录
- if (collect1.size()>0) {
+ if (collect1.size() > 0) {
coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect1));
coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", studentPay.getCoursePackageId()));
}
@@ -586,9 +592,6 @@
counsumService.save(courseCounsum);
-
-
-
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
courseCounsum1.setReason("课时转移");
@@ -596,7 +599,6 @@
courseCounsum1.setChangeType(1);
courseCounsum1.setPaymentId(to.getId());
counsumService.save(courseCounsum);
-
TCoursePackage tCoursePackage = packageService.getById(studentPay.getCoursePackageId());
@@ -612,16 +614,13 @@
List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", studentPay.getCoursePackageId()));
List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//拿到最后一天的排课记录
- if (collect.size()>0) {
+ if (collect.size() > 0) {
coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", studentPay.getCoursePackageId()));
}
-
Date today = new Date();
-
-
TCoursePackagePayment pay = coursePackagePaymentService.getById(studentPay.getId());
@@ -632,17 +631,17 @@
// 本周周几
// int i = DateUtil.dayOfWeek(new Date())-1;
- Date[] dates = generateDateArray(14,today);
- can = laveClassHours2/codeTime;
+ Date[] dates = generateDateArray(14, today);
+ can = laveClassHours2 / codeTime;
for (Date date : dates) {
- if (count==can){
+ if (count == can) {
break;
}
- int wei = DateUtil.dayOfWeek(date);
- if (week.contains(wei)){
+ int wei = DateUtil.dayOfWeek(date);
+ if (week.contains(wei)) {
for (int i1 = 0; i1 < split.length; i1++) {
- if (count==can){
+ if (count == can) {
break;
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
@@ -676,19 +675,20 @@
@Resource
private StudentClient studentClient;
@Autowired
- private CourseCounsumService courseCounsumService;
- @RequestMapping(value = "/toHoli",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
+ private CourseCounsumService courseCounsumService;
+
+ @RequestMapping(value = "/toHoli", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
@ResponseBody
public String toHoli(@RequestBody ToHoliDto toHoliDto) throws ParseException {
- String [] ids = toHoliDto.getIds();
+ String[] ids = toHoliDto.getIds();
List<String> strings = new ArrayList<>();
- for (String id : ids){
+ for (String id : ids) {
//扣除课时
TCoursePackagePayment payment = paymentService.getById(id);
- System.out.println("=====byId========="+payment);
+ System.out.println("=====byId=========" + payment);
Integer laveClassHours = payment.getLaveClassHours();
@@ -697,8 +697,9 @@
Integer totalClassHours = payment.getTotalClassHours();
Student student = studentClient.queryStudentById(payment.getStudentId());
- if (laveClassHours < classNum){
- strings.add(student.getName()); continue;
+ if (laveClassHours < classNum) {
+ strings.add(student.getName());
+ continue;
}
Integer laveClassHoursnew = laveClassHours - classNum;
@@ -734,7 +735,7 @@
courseCounsum.setReason("报名假期班");
courseCounsumService.save(courseCounsum);
- //排假期课
+ //排假期课
TCoursePackage tCoursePackage = packageService.getById(toHoliDto.getClassId());
String classWeeks = tCoursePackage.getClassWeeks();
@@ -748,7 +749,7 @@
LocalDate endDate = endTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
Period period = Period.between(startDate, endDate);
int days = period.getDays() + 1;
- Integer can =999;
+ Integer can = 999;
int count = 0;
String[] split = tCoursePackage.getClassStartTime().split(",");
String[] split1 = tCoursePackage.getClassEndTime().split(",");
@@ -759,18 +760,18 @@
calendar.setTime(startTime);
calendar.add(Calendar.DAY_OF_MONTH, -1);
- Date[] dates = generateDateArray(days,calendar.getTime());
+ Date[] dates = generateDateArray(days, calendar.getTime());
for (Date date : dates) {
- if (count==can){
+ if (count == can) {
break;
}
- int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date)-1;
- if (wei == 0){
- wei =7;
+ int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date) - 1;
+ if (wei == 0) {
+ wei = 7;
}
- if (week.contains(wei)){
+ if (week.contains(wei)) {
for (int i1 = 0; i1 < split.length; i1++) {
- if (count==can){
+ if (count == can) {
break;
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
@@ -797,19 +798,15 @@
}
-
-
- System.out.println("保存成功=============》="+holi);
-
+ System.out.println("保存成功=============》=" + holi);
}
String[] stringArray = strings.toArray(new String[strings.size()]);
String join = StringUtils.join(stringArray, ",");
- System.out.println("==========join========"+join);
+ System.out.println("==========join========" + join);
return join;
-
}
@@ -817,7 +814,8 @@
@Autowired
private TCoursePackagePaymentService coursePackagePaymentService;
- public static Date[] generateDateArray(int numDays,Date date) {
+
+ public static Date[] generateDateArray(int numDays, Date date) {
// LocalDate tomorrow = LocalDate.now().plusDays(1);
LocalDate tomorrow = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
@@ -830,11 +828,12 @@
return dates;
}
- private List<Integer> week(String week){
+
+ private List<Integer> week(String week) {
String[] split = week.split(";");
ArrayList<Integer> integers = new ArrayList<>();
for (String s : split) {
- switch (s){
+ switch (s) {
case "周一":
integers.add(1);
break;
@@ -864,18 +863,19 @@
@Autowired
private CoursePackageStudentService coursePackageStudentService;
- @RequestMapping(value = "/toTrans",produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
+
+ @RequestMapping(value = "/toTrans", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = "application/json;charset=UTF-8")
@ResponseBody
public String toTrans(@RequestBody ToHoliDto toHoliDto) throws ParseException {
- String [] ids = toHoliDto.getIds();
+ String[] ids = toHoliDto.getIds();
List<String> strings = new ArrayList<>();
- for (String id : ids){
+ for (String id : ids) {
//扣除课时
TCoursePackagePayment payment = paymentService.getById(id);
- System.out.println("=====byId========="+payment);
+ System.out.println("=====byId=========" + payment);
Integer laveClassHours = payment.getLaveClassHours();
@@ -903,7 +903,7 @@
TCoursePackagePayment one = paymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", student.getId()).eq("coursePackageId", toHoliDto.getClassId()));
TCoursePackagePayment holi = new TCoursePackagePayment();
- if (one==null){
+ if (one == null) {
holi.setAppUserId(student.getAppUserId());
holi.setStudentId(student.getId());
holi.setCoursePackageId(toHoliDto.getClassId());
@@ -915,14 +915,14 @@
holi.setStatus(1);
paymentService.save(holi);
- }else{
- one.setTotalClassHours(one.getTotalClassHours()+laveClassHours);
- one.setLaveClassHours(one.getLaveClassHours()+laveClassHours);
+ } else {
+ one.setTotalClassHours(one.getTotalClassHours() + laveClassHours);
+ one.setLaveClassHours(one.getLaveClassHours() + laveClassHours);
one.setAppUserId(null);
paymentService.updateById(one);
- holi=one;
+ holi = one;
}
- System.out.println("保存成功=============》="+holi);
+ System.out.println("保存成功=============》=" + holi);
CourseCounsum courseCounsum = new CourseCounsum();
@@ -932,7 +932,6 @@
courseCounsum.setInsertTime(new Date());
courseCounsum.setReason("换课");
courseCounsumService.save(courseCounsum);
-
TCoursePackage tCoursePackage = packageService.getById(toHoliDto.getClassId());
@@ -948,15 +947,13 @@
List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", student.getId()).eq("coursePackageId", toHoliDto.getClassId()));
List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
//拿到最后一天的排课记录
- if (collect.size()>0) {
+ if (collect.size() > 0) {
coursePackageSchedulingService.delete(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", student.getId()).eq("coursePackageId", toHoliDto.getClassId()));
}
Date today = new Date();
-
-
TCoursePackagePayment pay = coursePackagePaymentService.getById(holi.getId());
@@ -970,17 +967,17 @@
// 本周周几
// int i = DateUtil.dayOfWeek(new Date())-1;
- Date[] dates = generateDateArray(14,today);
- can = laveClassHours1/codeTime;
+ Date[] dates = generateDateArray(14, today);
+ can = laveClassHours1 / codeTime;
for (Date date : dates) {
- if (count==can){
+ if (count == can) {
break;
}
- int wei = DateUtil.dayOfWeek(date);
- if (week.contains(wei)){
+ int wei = DateUtil.dayOfWeek(date);
+ if (week.contains(wei)) {
for (int i1 = 0; i1 < split.length; i1++) {
- if (count==can){
+ if (count == can) {
break;
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
@@ -1007,15 +1004,13 @@
}
-
}
String[] stringArray = strings.toArray(new String[strings.size()]);
String join = StringUtils.join(stringArray, ",");
- System.out.println("==========join========"+join);
+ System.out.println("==========join========" + join);
return "转课成功";
}
-
}
--
Gitblit v1.7.1