From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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..c8bf140 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
@@ -1,6 +1,7 @@
 package com.dsh.course.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsh.course.entity.*;
 import com.dsh.course.feignclient.account.AppUserClient;
 import com.dsh.course.feignclient.account.CoachClient;
@@ -115,7 +116,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 +129,9 @@
     @Autowired
     private CourseCounsumService courseCounsumService;
 
+
+    @Autowired
+    private ICoursePackageOrderStudentService orderStudentService;
     /**
      * 添加数据
      *
@@ -135,10 +141,9 @@
     @PostMapping("/cancelledClasses/addCancelledClasses")
     public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses) {
         cancelledClassesService.save(cancelledClasses);
-
-        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());
@@ -146,4 +151,5 @@
         courseCounsumService.save(courseCounsum);
     }
 
+
 }

--
Gitblit v1.7.1