From dbcaaa33fdd45c704fd40926df0a542556e8e4f2 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期五, 18 九月 2026 17:15:09 +0800
Subject: [PATCH] feat:门店店长手机号列表展示问题

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 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 c291a17..ec3577a 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
@@ -491,11 +491,23 @@
                 }
             }
             TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
-            String[] split = re.getStudentIds().split(",");
-            Student student = studentClient.queryStudentById(Integer.valueOf(split[0]));
-            re.setPayStudent(student.getName());
-            re.setPayUser(appUser.getName());
-            re.setPhone(appUser.getPhone());
+            // 统计接口只关心订单金额;历史订单可能没有关联学员或用户,不能因此整批查询失败。
+            re.setPayStudent("无");
+            if (re.getStudentIds() != null && !re.getStudentIds().trim().isEmpty()) {
+                try {
+                    String[] split = re.getStudentIds().split(",");
+                    Student student = studentClient.queryStudentById(Integer.valueOf(split[0]));
+                    if (student != null && student.getName() != null) {
+                        re.setPayStudent(student.getName());
+                    }
+                } catch (NumberFormatException ignored) {
+                    // 历史脏数据按“无学员”返回,避免影响其他有效订单。
+                }
+            }
+            if (appUser != null) {
+                re.setPayUser(appUser.getName());
+                re.setPhone(appUser.getPhone());
+            }
         }
         return res;
     }
@@ -2662,7 +2674,8 @@
     @PostMapping("/coursePackagePayment/queryCourseData")
     public List<Map<String, Object>> queryCourseData(@RequestBody List<Integer> ids) {
         // 找出课程类型  找出剩余的课时数
-        List<TCoursePackageType> list = coursePackageTypeService.list();
+        List<TCoursePackageType> list = coursePackageTypeService.list(
+                new LambdaQueryWrapper<TCoursePackageType>().ne(TCoursePackageType::getState, 3));
         if (ids.size() == 0) {
             ids.add(-1);
         }
@@ -2714,7 +2727,8 @@
         map.put("allCourse",sum-sum1);
 
         //所有课包
-        List<TCoursePackage> coursePackages = tcpService.list();
+        List<TCoursePackage> coursePackages = tcpService.list(
+                new LambdaQueryWrapper<TCoursePackage>().ne(TCoursePackage::getState, 3));
 
 
         // 年
@@ -2864,7 +2878,8 @@
         map.put("allCourse", sum - sum1);
 
         //所有课包
-        List<TCoursePackage> coursePackages = tcpService.list();
+        List<TCoursePackage> coursePackages = tcpService.list(
+                new LambdaQueryWrapper<TCoursePackage>().ne(TCoursePackage::getState, 3));
 
 
         // 年
@@ -3011,7 +3026,8 @@
         map.put("allCourse", sum - sum1);
 
         //所有课包
-        List<TCoursePackage> coursePackages = tcpService.list();
+        List<TCoursePackage> coursePackages = tcpService.list(
+                new LambdaQueryWrapper<TCoursePackage>().ne(TCoursePackage::getState, 3));
 
 
         // 年

--
Gitblit v1.7.1