From d47bf3e1e3bf56b60ea6a1649ddd618d5ae803f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 十二月 2025 09:13:14 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 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 9df4c59..0c69ce0 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
@@ -882,6 +882,7 @@
}
+ System.err.println("课程报名！！！");
if (paymentCourseVo.getPayType() == 1) {//微信支付
return weChatPaymentCourse(uid, price, paymentCourseVo);
}
@@ -921,6 +922,7 @@
coursePackageOrder.setAppUserId(uid);
coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
coursePackageOrder.setPayType(paymentCourseVo.getPayType());
coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
@@ -942,6 +944,8 @@
coursePackageOrder.setAppUserId(null);
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrderService.updateById(coursePackageOrder);
}
TCoursePackage byId = coursePackageService.getById(paymentCourseVo.getId());
@@ -949,7 +953,7 @@
Store store = storeClient.queryStoreById(storeId);
if (store.getOperatorId()==null || store.getOperatorId()==0){
- ResultUtil weixinpay = payMoneyUtil.weixinpay("报名运动营", "", code, coursePackagePaymentConfig.getId().toString(),
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("报名运动营", "", code, paymentPrice.toString(),
"/base/course/weChatPaymentCourseCallback", "APP", "");
return weixinpay;
}else{
@@ -988,6 +992,8 @@
CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
coursePackageOrder.setCode(code);
coursePackageOrder.setAppUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
coursePackageOrder.setPayType(paymentCourseVo.getPayType());
@@ -1010,6 +1016,8 @@
coursePackageOrder.setAppUserId(null);
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
+
coursePackageOrderService.updateById(coursePackageOrder);
}
// 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
@@ -1238,6 +1246,7 @@
coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
coursePackageOrder.setPlayPaiCoin(paymentCourseVo.getPrice().intValue());
+ coursePackageOrder.setCoursePackagePaymentConfigId(paymentCourseVo.getCoursePackagePaymentConfigId());
coursePackageOrder.setPayUserType(1);
coursePackageOrder.setPayStatus(2);
coursePackageOrder.setPayUserId(appUser.getId());
@@ -1271,6 +1280,10 @@
*/
@Override
public ResultUtil paymentCourseCallback(String code, String trade_no, String attach) throws Exception {
+ System.err.println("进入回调");
+ System.err.println("code"+ code);
+ System.err.println("trade_no"+ trade_no);
+ System.err.println("attach"+trade_no);
CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
.eq("code", code).eq("state", 1));
if (null == coursePackageOrder1 || coursePackageOrder1.getPayStatus() == 2) {
@@ -1280,11 +1293,16 @@
coursePackageOrder1.setOrderNumber(trade_no);
coursePackageOrder1.setAppUserId(null);
coursePackageOrderService.updateById(coursePackageOrder1);
-
+ TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+ // 将用户优惠券修改为已使用
+ Long userCouponId = coursePackageOrder1.getUserCouponId();
+ if (userCouponId!=null){
+ userCouponClient.updateUserCouponStatus(userCouponId,coursePackage.getStoreId(),coursePackage.getSiteId());
+ }
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(attach);
addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
- TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
- Store store = storeClient.queryStoreById(byId.getStoreId());
+// TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
+// Store store = storeClient.queryStoreById(byId.getStoreId());
// moneyOut(trade_no,trade_no,code);
return ResultUtil.success();
}
@@ -1293,11 +1311,16 @@
/**
* 支付成功后添加学员课时数据
*
- * @param coursePackagePaymentConfig
*/
@Override
- public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfig) {
+ public void addCoursePackageOrderStudent(Long coursePackageOrderId, CoursePackagePaymentConfig coursePackagePaymentConfigServiceById) {
+ System.err.println("添加学员课时数据");
+ System.err.println("coursePackageOrderId"+coursePackageOrderId);
+// System.err.println("coursePackagePaymentConfig"+coursePackagePaymentConfig);
+
CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(coursePackageOrderId);
+ CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(coursePackageOrder.getCoursePackagePaymentConfigId());
+
// 发放优惠券
userCouponClient.sendUserCoupon(new SendCouponReq(coursePackageOrder.getAppUserId(), coursePackagePaymentConfig.getCouponIds()));
@@ -1311,6 +1334,7 @@
CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>().eq("studentId", id)
.eq("coursePackageId", coursePackageOrder.getCoursePackageId()).eq("state", 1));
if (null == coursePackageOrderStudent) {
+ System.err.println("新增课包订单学员数据");
coursePackageOrderStudent = new CoursePackageOrderStudent();
coursePackageOrderStudent.setAppUserId(coursePackageOrder.getAppUserId());
coursePackageOrderStudent.setStudentId(Integer.valueOf(id));
@@ -1345,7 +1369,7 @@
//开始排课
if(b){
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
}
//课时记录
@@ -1367,6 +1391,7 @@
courseCounsumService.save(courseCounsum1);
}
} else {
+ System.err.println("更新");
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours());
@@ -1392,10 +1417,13 @@
studentClient.frozen(student);
//中间断课，没有连续续费的情况需要重新排课
- if (useTime.compareTo(new Date()) < 0 && b) {
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+// if (useTime.compareTo(new Date()) < 0 && b) {
+// addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+// }
+ //开始排课
+ if(b){
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
}
-
//课时记录
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
@@ -1417,7 +1445,7 @@
}
}
if(coursePackage.getType() == 2){
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), null, null);
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), null, null);
}
}
}
@@ -1426,12 +1454,17 @@
/**
* 新购买课程后的排课
*
- * @param userId
* @param sId
* @throws ParseException
*/
- private void addPackageStudent(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent, Date validity) {
+ private void addPackageStudent(TCoursePackage tCoursePackage, CoursePackageOrder coursePackageOrder, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent, Date validity) {
try {
+ Integer userId = coursePackageOrder.getAppUserId();
+ //扣除课时数
+ Integer codeTime = tCoursePackage.getCodeTime();
+ Integer totalClassHours = coursePackageOrder.getClassHours();
+ // 排课次数
+ Integer schedulingNum= totalClassHours/codeTime;
//1常规 2假期 3体验
if (tCoursePackage.getType() == 1) {
//上课星期
@@ -1444,23 +1477,23 @@
.orderByDesc("classDate")
.last(" limit 0, 1")
);
- if(null != one){
- //先检测是否需要继续进行排课
- Calendar calendar1 = Calendar.getInstance();
- calendar1.setTime(one.getClassDate());
- int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
- day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
- int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
-
- Calendar calendar2 = Calendar.getInstance();
- calendar2.setTime(new Date());
- int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
-
- //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
- if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
- return;
- }
- }
+// if(null != one){
+// //先检测是否需要继续进行排课
+// Calendar calendar1 = Calendar.getInstance();
+// calendar1.setTime(one.getClassDate());
+// int day_week1 = calendar1.get(Calendar.DAY_OF_WEEK);
+// day_week1 = day_week1 - 1 == 0 ? 7 : day_week1 - 1;
+// int week_of_month = calendar1.get(Calendar.WEEK_OF_MONTH);
+//
+// Calendar calendar2 = Calendar.getInstance();
+// calendar2.setTime(new Date());
+// int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
+//
+// //最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
+// if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
+// return;
+// }
+// }
//上课时段
String[] split = tCoursePackage.getClassStartTime().split(",");
@@ -1470,11 +1503,14 @@
//剩余课时
Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
- //扣除课时数
- Integer codeTime = tCoursePackage.getCodeTime();
- //排课 本周+下周，课时不够扣则直接剩余不排课
+
+ //排课 课时不够扣则直接剩余不排课
Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
+ if (one!=null){
+ calendar.setTime(one.getClassDate());
+ }else{
+ calendar.setTime(new Date());
+ }
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
@@ -1483,7 +1519,7 @@
day_week = day_week - 1 == 0 ? 7 : day_week - 1;
int num = 8 - day_week + 7;
- for (int i = 0; i < num; i++) {
+ for (int i = 0; i < schedulingNum; i++) {
Date time = calendar.getTime();
//判断当天是否在排课星期内
@@ -1491,6 +1527,7 @@
day = day - 1 == 0 ? 7 : day - 1;
if (!week.contains(day)) {
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ schedulingNum--;
continue;
}
@@ -1511,6 +1548,8 @@
//有体验购课，不进行排课
if(count != 0){
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ schedulingNum--;
+
continue;
}
--
Gitblit v1.7.1