From cf28c25d1a8e360ab328c5435d289c5cb9b414c1 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期六, 25 十一月 2023 21:06:34 +0800
Subject: [PATCH] 11.26
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 199a25d..9db33b0 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
@@ -1001,7 +1001,7 @@
coursePackageOrder1.setOrderNumber(transaction_id);
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
- addCoursePackageOrderStudent(coursePackageOrder1, coursePackagePaymentConfig);
+ addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
break;
}
if ("USERPAYING".equals(s)) {
@@ -1091,7 +1091,7 @@
coursePackageOrder1.setOrderNumber(tradeNo);
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
- addCoursePackageOrderStudent(coursePackageOrder1, coursePackagePaymentConfig);
+ addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
break;
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -1147,7 +1147,7 @@
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
- addCoursePackageOrderStudent(coursePackageOrder, coursePackagePaymentConfig);
+ addCoursePackageOrderStudent(coursePackageOrder.getId(), coursePackagePaymentConfig);
return ResultUtil.success();
}
@@ -1172,7 +1172,7 @@
coursePackageOrderService.updateById(coursePackageOrder1);
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
- addCoursePackageOrderStudent(coursePackageOrder1, coursePackagePaymentConfig);
+ addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
return ResultUtil.success();
}
@@ -1180,10 +1180,10 @@
/**
* 支付成功后添加学员课时数据
*
- * @param coursePackageOrder
* @param coursePackagePaymentConfig
*/
- public void addCoursePackageOrderStudent(CoursePackageOrder coursePackageOrder, CoursePackagePaymentConfig coursePackagePaymentConfig) {
+ public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
// 发放优惠券
userCouponClient.sendUserCoupon(new SendCouponReq(coursePackageOrder.getAppUserId(), coursePackagePaymentConfig.getCouponIds()));
@@ -1211,6 +1211,7 @@
calendar.setTime(new Date());
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + validDays);
coursePackageOrderStudent.setUseTime(calendar.getTime());
+ coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
//开始排课
addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent);
@@ -1223,15 +1224,15 @@
calendar.setTime(useTime.compareTo(new Date()) < 0 ? new Date() : useTime);
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + validDays);
coursePackageOrderStudent.setUseTime(calendar.getTime());
+ coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
//中间断课，没有连续续费的情况需要重新排课
if (useTime.compareTo(new Date()) < 0) {
addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent);
}
}
- coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
CourseCounsum courseCounsum = new CourseCounsum();
- courseCounsum.setPaymentId(coursePackageOrder.getId());
+ courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
courseCounsum.setChangeType(1);
courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
courseCounsum.setInsertTime(new Date());
@@ -1301,6 +1302,9 @@
laveClassHours -= codeTime;
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+ coursePackageScheduling.setType(tCoursePackage.getType());
+ coursePackageScheduling.setAppUserId(userId);
+ coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
@@ -1360,6 +1364,9 @@
break;
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+ coursePackageScheduling.setType(tCoursePackage.getType());
+ coursePackageScheduling.setAppUserId(userId);
+ coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
--
Gitblit v1.7.1