From 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:32 +0800
Subject: [PATCH] bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 92 ++++++++++++++++++++++++++++------------------
1 files changed, 56 insertions(+), 36 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 922d378..d2cef33 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -133,8 +133,6 @@
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
-
-
@Autowired
private ICoursePackageOrderStudentService coursePackageOrderStudentService;
@@ -143,6 +141,16 @@
@Resource
private AppUserClient appuClient;
+
+ @Autowired
+ private CourseCounsumService courseCounsumService;
+
+ @Autowired
+ private TCoursePackagePaymentService coursePackagePaymentService;
+
+
+
+
/**
@@ -194,6 +202,7 @@
coursePackageOrder.setStatus(1);
coursePackageOrder.setState(1);
coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrder.setOrderType(1);
coursePackageOrder.setSalesName(packagePayment.getSalesName());
coursePackageOrderService.save(coursePackageOrder);
// 生成排课数据
@@ -681,7 +690,7 @@
PurchaseRecordVo recordVo = new PurchaseRecordVo();
recordVo.setPurchaseAmount("+" + cspackage.getClassHours());
recordVo.setPurchaseTime(format.format(cspackage.getInsertTime()));
- recordVo.setPurchaseType("购买课包");
+ recordVo.setPurchaseType("报名运动营");
purchaseRecordVos.add(recordVo);
});
}
@@ -689,11 +698,7 @@
}
- @Autowired
- private CourseCounsumService courseCounsumService;
- @Autowired
- private TCoursePackagePaymentService coursePackagePaymentService;
@PostMapping("/base/coursePack/getRecord")
public List<PurchaseRecordVo> getRecord(@RequestBody RecordTimeRequest recordTimeRequest) {
@@ -1168,10 +1173,11 @@
public ResultUtil continuationOperation(ClasspaymentRequest request) {
try {
Integer userId = tokenUtil.getUserIdFormRedis();
+ System.err.println("续课参数"+request);
if (null == userId) {
return ResultUtil.tokenErr();
}
- Integer couponId = request.getConponId();
+ Long couponId = request.getConponId();
if (couponId == null || couponId == 0) {
request.setConponId(null);
}
@@ -1330,6 +1336,16 @@
.eq("coursePackageSchedulingId", coursePackageScheduling.getId()));
}
}
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
+ courseCounsum.setChangeType(0);
+ courseCounsum.setNum(paymentDeductionClassHour.getClassHour());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("赛事报名");
+ courseCounsum.setAppUserId(coursePackageOrderStudent.getAppUserId());
+ courseCounsumService.save(courseCounsum);
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -1505,7 +1521,7 @@
courseCounsum.setChangeType(1);
courseCounsum.setNum(packagePayment.getClassHours());
courseCounsum.setInsertTime(new Date());
- courseCounsum.setReason("购买课包");
+ courseCounsum.setReason("报名运动营");
courseCounsumService.save(courseCounsum);
} catch (Exception e) {
@@ -1562,9 +1578,9 @@
}
@PostMapping("/base/coursePack/savePaymentCoursePackage")
- public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment) {
-
- return packagePaymentService.save(packagePayment);
+ public Long savePaymentCoursePackage(@RequestBody CoursePackageOrder coursePackageOrder) {
+ coursePackageOrderService.save(coursePackageOrder);
+ return coursePackageOrder.getId();
}
@@ -2064,12 +2080,7 @@
@ResponseBody
@PostMapping("/base/coursePack/obtainStudentClassDetails")
public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId) {
-// try {
return coursePackageOrderStudentService.obtainStuClassDetails(stuId.getStuId(), stuId.getAppUserId(), stuId.getPageNum());
-// }catch (Exception e){
-// e.printStackTrace();
-// throw new RuntimeException();
-// }
}
@@ -2090,12 +2101,13 @@
@PostMapping("/base/coursePack/sendHours")
public Integer sendHours(@RequestBody String s) throws ParseException {
String[] split2 = s.split("_");
- TCoursePackagePayment byId = packagePaymentService.getById(Long.valueOf(split2[0]));
- byId.setTotalClassHours(byId.getTotalClassHours() + Integer.valueOf(split2[2]));
- boolean b = packagePaymentService.updateHoursById(byId, Integer.valueOf(split2[2]));
+ CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getById(Long.valueOf(split2[0]));
+ coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + Integer.valueOf(split2[2]));
+ coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + Integer.valueOf(split2[2]));
+ coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
CourseCounsum courseCounsum = new CourseCounsum();
- courseCounsum.setPaymentId(byId.getId());
+ courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
courseCounsum.setChangeType(1);
courseCounsum.setNum(Integer.valueOf(split2[2]));
courseCounsum.setInsertTime(new Date());
@@ -2103,17 +2115,17 @@
courseCounsumService.save(courseCounsum);
- List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", byId.getStudentId()).eq("coursePackageId", byId.getCoursePackageId()));
+ List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackageOrderStudent.getStudentId()).eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId()));
List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id", collect));
- coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", byId.getStudentId()).eq("coursePackageId", byId.getCoursePackageId()));
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackageOrderStudent.getStudentId()).eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId()));
- TCoursePackage tCoursePackage = packageService.getById(byId.getCoursePackageId());
+ TCoursePackage tCoursePackage = packageService.getById(coursePackageOrderStudent.getCoursePackageId());
String classWeeks = tCoursePackage.getClassWeeks();
List<Integer> week = week(classWeeks);
- TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", byId.getCoursePackageId()).eq("studentId", byId.getStudentId()));
+ TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId()).eq("studentId", coursePackageOrderStudent.getStudentId()));
Date today = new Date();
@@ -2160,14 +2172,7 @@
}
}
}
-
-
- if (b) {
- return 1;
- } else {
-
- return 0;
- }
+ return 1;
}
@@ -2375,14 +2380,28 @@
@PostMapping("/base/coursePack/getConsumes")
List<CourseCounsum> getConsumes(@RequestBody BillingDataRequestVo requestVo) {
Integer[] integers = {2, 3};
- QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>().in("changeType", integers).eq("appUserId", requestVo.getAppUserId());
+ QueryWrapper<CourseCounsum> courseCounsumQueryWrapper = new QueryWrapper<CourseCounsum>()
+ .in("changeType", integers).eq("appUserId", requestVo.getAppUserId());
if (requestVo.getMonthEnd() != null) {
courseCounsumQueryWrapper.ge("insertTime", requestVo.getMonthStart());
courseCounsumQueryWrapper.le("insertTime", requestVo.getMonthEnd());
}
return courseCounsumService.list(courseCounsumQueryWrapper);
-
}
+
+
+ @ResponseBody
+ @PostMapping("/base/coursePack/getCoursePackageOrder")
+ public List<CoursePackageOrder> getCoursePackageOrder(@RequestBody BillingDataRequestVo requestVo){
+ QueryWrapper<CoursePackageOrder> wrapper = new QueryWrapper<CoursePackageOrder>().eq("appUserId", requestVo.getAppUserId())
+ .in("payType", Arrays.asList(1, 2, 5, 6)).eq("payStatus", 2).eq("state", 1).eq("orderType", 1);
+ return coursePackageOrderService.list(wrapper);
+ }
+
+
+
+
+
@ResponseBody
@@ -2412,7 +2431,8 @@
// 找出门店的所有课程 排出体验
List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>()
.eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3)
- .eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week));
+ .eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week)
+ .eq(TCoursePackage::getAuditStatus, 2));
List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
if (collect.size() == 0) {
collect.add(-1);
--
Gitblit v1.7.1