From 197431f6ce578d87a0156d2b8b13f1d327ba5e1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 30 一月 2024 14:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
index 54f63a2..bbf7b1d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
@@ -115,7 +115,9 @@
cancelClassesVO.setStartAndEnd(temp);
TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelClassesVO.getCoursePackagePaymentId());
cancelClassesVO.setStoreName(storeClient.queryStoreById(cancelClassesVO.getStoreId()).getName());
- cancelClassesVO.setStudentName(studentClient.queryStudentById(byId.getStudentId()).getName());
+ if(null != byId){
+ cancelClassesVO.setStudentName(studentClient.queryStudentById(byId.getStudentId()).getName());
+ }
cancelClassesVO.setCoachName(coachClient.queryCoachById(cancelClassesVO.getCoachId()).getName());
}
@@ -126,6 +128,9 @@
@Autowired
private CourseCounsumService courseCounsumService;
+
+ @Autowired
+ private ICoursePackageOrderStudentService orderStudentService;
/**
* 添加数据
*
@@ -136,9 +141,10 @@
public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses) {
cancelledClassesService.save(cancelledClasses);
- TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
+// TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
+ orderStudentService.getById(cancelledClasses.getCoursePackagePaymentId());
CourseCounsum courseCounsum = new CourseCounsum();
- courseCounsum.setPaymentId(byId.getId());
+ courseCounsum.setPaymentId(cancelledClasses.getCoursePackagePaymentId());
courseCounsum.setChangeType(0);
courseCounsum.setNum(cancelledClasses.getCancelledClassesNumber());
courseCounsum.setInsertTime(new Date());
--
Gitblit v1.7.1