From 5df006aac405fe996fff71f7854e37c324892367 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 09 十月 2023 18:27:48 +0800
Subject: [PATCH] 后台代码提交
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 149 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 135 insertions(+), 14 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index bc00abc..2f691bb 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -14,6 +14,7 @@
import com.dsh.course.feignclient.account.model.AppUser;
import com.dsh.course.feignclient.account.model.Student;
import com.dsh.course.feignclient.account.model.TCourseInfoRecord;
+import com.dsh.course.feignclient.account.model.TStudent;
import com.dsh.course.feignclient.activity.CouponClient;
import com.dsh.course.feignclient.activity.model.Coupon;
import com.dsh.course.feignclient.model.*;
@@ -124,6 +125,8 @@
private CoursePackageSchedulingMapper coursePackageSchedulingMapper;
@Autowired
private ICoursePackageSchedulingService coursePackageSchedulingService;
+ @Autowired
+ private CoursePackageStudentService coursePackageStudentService;
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
/**
@@ -135,6 +138,8 @@
packagePayment.setInsertTime(new Date());
packagePayment.setInsertTime(new Date());
Integer studentId = packagePayment.getStudentId();
+ // 添加学员上课记录
+ CoursePackageStudent coursePackageStudent = new CoursePackageStudent();
TCoursePackagePayment one = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", packagePayment)
.orderByDesc("insertTime")
.last("LIMIT 1"));
@@ -144,8 +149,11 @@
Integer absencesNumber = one.getAbsencesNumber();
// 没有过期
if (one.getUseTime().after(new Date())){
- packagePayment.setTotalClassHours(packagePayment.getClassHours()+one.getTotalClassHours());
- packagePayment.setLaveClassHours(packagePayment.getClassHours()+one.getLaveClassHours());
+ if (one.getLaveClassHours()-packagePayment.getClassHours()<0){
+ return 5002;
+ }
+ packagePayment.setTotalClassHours(one.getTotalClassHours());
+ packagePayment.setLaveClassHours(one.getLaveClassHours()-packagePayment.getClassHours());
packagePayment.setAbsencesNumber(one.getAbsencesNumber());
}
packagePayment.setTotalClassHours(packagePayment.getClassHours());
@@ -215,6 +223,8 @@
coursePackageScheduling.setEndDate(endDate.getTime());
coursePackageScheduling.setStatus(1);
coursePackageSchedulingService.save(coursePackageScheduling);
+ coursePackageStudent.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+
List<CoursePackageScheduling> list1 = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>()
.eq("coursePackageId", coursePackage.getId())
.eq("classDate", classDate.getTime())
@@ -233,7 +243,18 @@
} catch (ParseException e) {
e.printStackTrace();
}
- return packagePaymentService.save(packagePayment);
+
+ coursePackageStudent.setStudentId(packagePayment.getStudentId());
+ coursePackageStudent.setCoursePackageId(packagePayment.getCoursePackageId());
+
+
+ coursePackageStudent.setSignInOrNot(0);
+ coursePackageStudent.setReservationStatus(1);
+ coursePackageStudent.setInsertTime(new Date());
+ coursePackageStudent.setAppUserId(packagePayment.getAppUserId());
+ packagePaymentService.save(packagePayment);
+ coursePackageStudent.setCoursePackagePaymentId(packagePayment.getId());
+ return coursePackageStudentService.save(coursePackageStudent);
}
/**
* 手动支付
@@ -272,19 +293,19 @@
List<AppUser> appUsers = appUserClient.queryAppUserListByName(query.getPayUser());
for (AppUser user : appUsers) {
if (appUser.getName().equals(user.getName())){
- result.add(re);
+ if (query.getPayStudent()== null || query.getPayStudent().equals("")){
+ }else{
+ List<Student> students = studentClient.queryStudentListByName(query.getPayStudent());
+ for (Student student1 : students) {
+ if (student.getName().equals(student1.getName())){
+ result.add(re);
+ }
+ }
+ }
}
}
}
- if (query.getPayStudent()== null || query.getPayStudent().equals("")){
- }else{
- List<Student> students = studentClient.queryStudentListByName(query.getPayStudent());
- for (Student student1 : students) {
- if (student.getName().equals(student1.getName())){
- result.add(re);
- }
- }
- }
+
if (re.getPayType()!=null){
if (re.getPayType()==1){
re.setBuyTypeName("微信支付");
@@ -304,6 +325,7 @@
}
// 如果支付用户类型为管理员 则购买方式则为1线下购买
+ if (re.getPayUserType()!=null){
if (re.getPayUserType()== 2){
re.setBuyType(1);
}else{
@@ -317,6 +339,7 @@
}
}
}
+ }
if (query.getPayStudent()== null || query.getPayStudent().equals("")){
if (query.getPayUser()== null || query.getPayUser().equals("")){
return res;
@@ -326,6 +349,47 @@
}else{
return result;
}
+ }
+
+ /**
+ * 获取报名订单记录列表
+ */
+ @ResponseBody
+ @RequestMapping("/registerOrder/listAllRegister")
+ public List<RegisterOrderVO> listAllRegister(@RequestBody RegisterOrderQuery query){
+ if (query.getStudentName()!=null){
+ if (!query.getStudentName().equals("")){
+ List<TStudent> students1 = studentClient.queryTStudentListByName(query.getStudentName());
+ List<Integer> studentIds = students1.stream().map(TStudent::getId).collect(Collectors.toList());
+ query.setStudentIds(studentIds);
+ if (students1.size()==0){
+ return new ArrayList<>();
+ }
+ }
+ }
+
+ List<RegisterOrderVO> res = packagePaymentService.listAllRegister(query);
+ List<RegisterOrderVO> result = new ArrayList<>();
+ for (RegisterOrderVO re : res) {
+ if(re.getSalesName()==null){
+ re.setSalesName("无");
+ }
+ if(re.getPayType()!=null){
+ if (re.getPayType() == 3){
+ re.setPayMoneyAndType(re.getPlayPaiCoin()+"玩湃币");
+ }else{
+ re.setPayMoneyAndType("￥"+re.getMoney());
+ }
+ }
+ Store store = storeClient.queryStoreById(re.getStoreId());
+ TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
+ Student student = studentClient.queryStudentById(re.getStudentId());
+ re.setPayStudent(student.getName());
+ re.setPayUser(appUser.getName());
+ re.setPhone(appUser.getPhone());
+ re.setStoreName(store.getName());
+ }
+ return res;
}
/**
@@ -1179,7 +1243,7 @@
return packagePaymentService.save(packagePayment);
}
-
+ @ResponseBody
@PostMapping("/base/coursePack/obtainStudentClassDetails")
public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId){
try {
@@ -1292,6 +1356,20 @@
public void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment){
coursePackagePayment.setAppUserId(null);
packagePaymentService.updateById(coursePackagePayment);
+ }
+
+
+
+ /**
+ * 修改数据
+ * @param coursePackagePayment
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment1")
+ public void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment){
+ System.out.println("editCoursePackagePayment1====coursePackagePayment"+coursePackagePayment);
+// coursePackagePayment.setCoursePackageId(null);
+ packagePaymentService.updateBytime(coursePackagePayment);
}
@@ -1480,4 +1558,47 @@
return a;
}
+
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/queryCourseData")
+ public List<Map<String,Object>> queryCourseData(@RequestBody List<Integer> ids){
+ // 找出课程类型 找出剩余的课时数
+ List<TCoursePackageType> list = coursePackageTypeService.list();
+ if(ids.size()==0){
+ ids.add(-1);
+ }
+ List<TCoursePackagePayment> list1 = packagePaymentService.listOne(ids);
+ List<Integer> collect = list1.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ List<TCoursePackage> list2 = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
+ for (TCoursePackagePayment tCoursePackagePayment : list1) {
+ for (TCoursePackage tCoursePackage : list2) {
+ if(tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())){
+ tCoursePackagePayment.setType(tCoursePackage.getType());
+ }
+ }
+ }
+
+
+ List<Map<String,Object>> mapList = new ArrayList<>();
+ for (TCoursePackageType tCoursePackageType : list) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("name",tCoursePackageType.getName());
+ int a =0;
+ for (TCoursePackagePayment tCoursePackagePayment : list1) {
+ if(tCoursePackagePayment.getType().equals(tCoursePackageType.getId())){
+ a += tCoursePackagePayment.getLaveClassHours();
+ }
+ }
+ map.put("value",a);
+ mapList.add(map);
+ }
+
+
+ return mapList;
+ }
+
+
}
--
Gitblit v1.7.1