From 7c109728a00564a841b7aceb6103e32ba7852243 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 28 十一月 2023 19:20:16 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 4b9f2a1..e4eac41 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1176,7 +1176,7 @@
for (String id : split) {
if(coursePackage.getType() == 1){
CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>().eq("studentId", id)
- .eq("coursePackageId", coursePackageOrder.getCoursePackageId()).eq("status", 1).eq("state", 1));
+ .eq("coursePackageId", coursePackageOrder.getCoursePackageId()).eq("state", 1));
if (null == coursePackageOrderStudent) {
coursePackageOrderStudent = new CoursePackageOrderStudent();
coursePackageOrderStudent.setAppUserId(coursePackageOrder.getAppUserId());
@@ -1208,18 +1208,22 @@
courseCounsum.setReason("购买课包");
courseCounsumService.save(courseCounsum);
//账单记录
- CourseCounsum courseCounsum1 = new CourseCounsum();
- courseCounsum1.setPaymentId(coursePackageOrder.getId());
- courseCounsum1.setChangeType(3);
- courseCounsum1.setInsertTime(new Date());
- courseCounsum1.setReason("报名课程;"+coursePackageOrder.getCashPayment());
- courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
- courseCounsumService.save(courseCounsum1);
+ if(coursePackageOrder.getPayType() != 3){
+ CourseCounsum courseCounsum1 = new CourseCounsum();
+ courseCounsum1.setPaymentId(coursePackageOrder.getId());
+ courseCounsum1.setChangeType(3);
+ courseCounsum1.setInsertTime(new Date());
+ courseCounsum1.setReason("报名课程;"+coursePackageOrder.getCashPayment());
+ courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
+ courseCounsumService.save(courseCounsum1);
+ }
+
} else {
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours());
+ coursePackageOrderStudent.setStatus(1);
Integer validDays = coursePackage.getValidDays();
Calendar calendar = Calendar.getInstance();
calendar.setTime(useTime.compareTo(new Date()) < 0 ? new Date() : useTime);
@@ -1240,13 +1244,15 @@
courseCounsum.setReason("续课");
courseCounsumService.save(courseCounsum);
//账单记录
- CourseCounsum courseCounsum1 = new CourseCounsum();
- courseCounsum1.setPaymentId(coursePackageOrder.getId());
- courseCounsum1.setChangeType(3);
- courseCounsum1.setInsertTime(new Date());
- courseCounsum1.setReason("续课;"+coursePackageOrder.getCashPayment());
- courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
- courseCounsumService.save(courseCounsum1);
+ if(coursePackageOrder.getPayType() != 3){
+ CourseCounsum courseCounsum1 = new CourseCounsum();
+ courseCounsum1.setPaymentId(coursePackageOrder.getId());
+ courseCounsum1.setChangeType(3);
+ courseCounsum1.setInsertTime(new Date());
+ courseCounsum1.setReason("续课;"+coursePackageOrder.getCashPayment());
+ courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
+ courseCounsumService.save(courseCounsum1);
+ }
}
--
Gitblit v1.7.1