From eb0534912e5dd2fbf65f64e96376af8e65a10c17 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 一月 2026 16:06:09 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 259 +++++++++++++++++++++++++++------------------------
1 files changed, 138 insertions(+), 121 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 b3bb319..7833f6d 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 获取对应的商户号
@@ -1031,85 +1039,63 @@
ResultUtil alipay = payMoneyUtil.alipay(smid1,"报名运动营", "报名运动营",
coursePackagePaymentConfig.getId().toString(),
code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
-// if (alipay.getCode() == 200) {
-// String finalCode = code;
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// Thread.sleep(1000);
-// int num = 1;
-// int wait = 0;
-// while (num <= 10) {
-// int min = 5000;
-// wait += (min * num);
-// Thread.sleep(wait);
-// CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
-// .eq("code", finalCode).eq("state", 1));
-// if (coursePackageOrder1.getPayStatus() == 2) {
-// break;
-// }
-// AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
-// if (null != alipayTradeQueryResponse) {
-// /**
-// * WAIT_BUYER_PAY（交易创建，等待买家付款）、
-// * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
-// * TRADE_SUCCESS（交易支付成功）、
-// * TRADE_FINISHED（交易结束，不可退款）
-// */
-// String s = alipayTradeQueryResponse.getTradeStatus();
-//
-// String tradeNo = alipayTradeQueryResponse.getTradeNo();
-// if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
-// //有待支付的订单，这里不处理
-//// coursePackageOrder1.setState(3);
-//// coursePackageOrderService.updateById(coursePackageOrder1);
-// break;
-// }
-// if ("TRADE_SUCCESS".equals(s)) {
-// coursePackageOrder1.setPayStatus(2);
-// coursePackageOrder1.setOrderNumber(tradeNo);
-// coursePackageOrder1.setAppUserId(null);
+ if (alipay.getCode() == 200) {
+ String finalCode = code;
+ String finalSmid = smid1;
+ String finalCode1 = code;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(1000);
+ int num = 1;
+ int wait = 0;
+ while (num <= 10) {
+ int min = 5000;
+ wait += (min * num);
+ Thread.sleep(wait);
+ CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
+ .eq("code", finalCode).eq("state", 1));
+ if (coursePackageOrder1.getPayStatus() == 2) {
+ break;
+ }
+ AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
+ if (null != alipayTradeQueryResponse) {
+ /**
+ * WAIT_BUYER_PAY（交易创建，等待买家付款）、
+ * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
+ * TRADE_SUCCESS（交易支付成功）、
+ * TRADE_FINISHED（交易结束，不可退款）
+ */
+ String s = alipayTradeQueryResponse.getTradeStatus();
+
+ String tradeNo = alipayTradeQueryResponse.getTradeNo();
+ if ("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10) {
+ //有待支付的订单，这里不处理
+// coursePackageOrder1.setState(3);
// coursePackageOrderService.updateById(coursePackageOrder1);
-// addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
-// moneyOut(tradeNo,tradeNo,finalCode);
-// // 根据课程id 查询这个课程属于哪个门店 属于哪个运营商
-// Integer id = paymentCourseVo.getId();
-// TCoursePackage byId = coursePackageService.getById(id);
-// Integer storeId = byId.getStoreId();
-// Store store = storeClient.queryStoreById(storeId);
-// Integer operatorId = store.getOperatorId();
-// if (operatorId==null){
-// String smid ="2088330203191220";
-// // 说明是平台的 不走分账
-//// payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
-// payMoneyUtil.confirm1(smid,finalCode,tradeNo,paymentPrice.toString());
-// break;
-// }else if (operatorId==0){
-// String smid ="2088330203191220";
-// // 说明是平台的
-// payMoneyUtil.confirm1(smid,finalCode,tradeNo,paymentPrice.toString());
-// break;
-// }else{
-// // 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
-// String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
-// payMoneyUtil.confirm(smidByOperatorId,finalCode,tradeNo,paymentPrice.toString());
-// // 分账处理
-// extracted(store, coursePackageOrder1, tradeNo);
-// break;
-// }
-// }
-// if ("WAIT_BUYER_PAY".equals(s)) {
-// num++;
-// }
-// }
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-// }).start();
-// }
+ break;
+ }
+ if ("TRADE_SUCCESS".equals(s)) {
+ coursePackageOrder1.setPayStatus(2);
+ coursePackageOrder1.setOrderNumber(tradeNo);
+ coursePackageOrder1.setAppUserId(null);
+ coursePackageOrderService.updateById(coursePackageOrder1);
+ addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
+ Thread.sleep(30000);
+ payMoneyUtil.confirm(finalSmid, finalCode1, tradeNo, paymentPrice.toString());
+ }
+ if ("WAIT_BUYER_PAY".equals(s)) {
+ num++;
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
return alipay;
}
@@ -1260,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());
@@ -1293,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) {
@@ -1302,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();
}
@@ -1315,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()));
@@ -1333,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));
@@ -1356,18 +1358,18 @@
boolean b = true;
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
- addOldPackageStudent(student);
- b = false;
+// addOldPackageStudent(student);
+// b = false;
}else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
student.setValidity(calendar.getTime());
- addOldPackageStudent(student);
- b = false;
+// addOldPackageStudent(student);
+// b = false;
}
studentClient.frozen(student);
//开始排课
if(b){
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), coursePackageOrderStudent, student.getValidity());
}
//课时记录
@@ -1389,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());
@@ -1404,20 +1407,23 @@
boolean b = true;
if(null == student.getValidity()){
student.setValidity(calendar.getTime());
- addOldPackageStudent(student);
- b = false;
+// addOldPackageStudent(student);
+// b = false;
}else if(calendar.getTimeInMillis() > student.getValidity().getTime()){
student.setValidity(calendar.getTime());
- addOldPackageStudent(student);
- b = false;
+// addOldPackageStudent(student);
+// b = false;
}
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());
@@ -1439,7 +1445,7 @@
}
}
if(coursePackage.getType() == 2){
- addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), null, null);
+ addPackageStudent(coursePackage, coursePackageOrder, Integer.valueOf(id), null, null);
}
}
}
@@ -1448,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) {
//上课星期
@@ -1466,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(",");
@@ -1492,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);
@@ -1505,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();
//判断当天是否在排课星期内
@@ -1513,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;
}
@@ -1533,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