From 48323fce3b4b8013755421aa1d1feb9a73cddde9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:42:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 4d355e3..1e18d25 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
@@ -10,11 +10,13 @@
import com.dsh.course.entity.dto.*;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.StudentClient;
+import com.dsh.course.feignclient.account.model.AppUser;
import com.dsh.course.feignclient.account.model.Student;
import com.dsh.course.mapper.CoursePackageSchedulingMapper;
import com.dsh.course.mapper.CoursePackageStudentMapper;
import com.dsh.course.model.dto.ToClassDto;
import com.dsh.course.service.*;
+import com.dsh.course.util.ALiSendSms;
import com.dsh.course.util.ResultUtil;
import com.dsh.course.util.UUIDUtil;
import io.swagger.annotations.Api;
@@ -76,18 +78,7 @@
@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) {
- // 根据门店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);
-
- System.out.println("=========pays======" + pays);
-
return pays;
}
@@ -189,6 +180,9 @@
@Resource
private AppUserClient appUserClient;
+
+ @Autowired
+ private ALiSendSms aLiSendSms;
@Autowired
@@ -688,7 +682,6 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
- coursePackageScheduling.setCoursePackagePaymentId();
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -749,7 +742,6 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
- coursePackageScheduling.setCoursePackagePaymentId();
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -841,6 +833,12 @@
coursePackageOrderStudent.setAppUserId(null);
coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours()-toHoliDto.getClassNum());
orderStudentService.updateById(coursePackageOrderStudent);
+ Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
+ if(3 >= laveClassHours){
+ AppUser appUser = appUserClient.queryAppUser(coursePackageOrderStudent.getAppUserId());
+ //发送短信提醒
+ aLiSendSms.sendSms(appUser.getPhone(), "SMS_463646317", "");
+ }
//上课星期
String classWeeks = coursePackage1.getClassWeeks();
@@ -879,7 +877,6 @@
coursePackageScheduling.setAppUserId(student.getAppUserId());
coursePackageScheduling.setStudentId(Integer.valueOf(stuId));
coursePackageScheduling.setCoursePackageId(coursePackage1.getId());
- coursePackageScheduling.setCoursePackagePaymentId();
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
--
Gitblit v1.7.1