From e0ec0a20cb943b4ee92c45b64f02b007a003b0ba Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 三月 2024 18:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
index 031e4fd..00bc62d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
@@ -15,6 +15,7 @@
import com.dsh.course.mapper.*;
import com.dsh.course.model.DeductionClassHour;
import com.dsh.course.model.DeductionClassHourList;
+import com.dsh.course.service.CourseCounsumService;
import com.dsh.course.service.ICoursePackageOrderStudentService;
import com.dsh.course.service.ICoursePackageSchedulingService;
import com.dsh.course.service.TCoursePackageService;
@@ -46,6 +47,9 @@
@Autowired
private ICoursePackageSchedulingService coursePackageSchedulingService;
+
+ @Autowired
+ private CourseCounsumService courseCounsumService;
@Resource
private TCoursePackageMapper tcpmapper;
@@ -240,8 +244,8 @@
if(n != 0){
n += 1;
l = (codeTime * n) - clss;
- coursePackageOrderStudent.setLaveClassHours(l);
}
+ coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + l);
//删除已排的课程
List<CoursePackageScheduling> coursePackageSchedulings = packageSchedulings.subList(0, n);
@@ -250,6 +254,15 @@
}
this.updateById(coursePackageOrderStudent);
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
+ courseCounsum.setChangeType(0);
+ courseCounsum.setNum(deductionClassHour.getClassHour());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("社区世界杯报名");
+ courseCounsum.setAppUserId(coursePackageOrderStudent.getAppUserId());
+ courseCounsumService.save(courseCounsum);
}
return true;
}catch (Exception e){
--
Gitblit v1.7.1