From 4ace06973022fd8cf3a6784a374ddbaa1aa78498 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 2 Apr 2025 16:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=BC=80=E8=AF=BE=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/entity/CourseCatalogueEntity.java  |  3 +++
 .../modules/common/vo/AddCoursesFrag.java     |  2 ++
 .../impl/UserCourseBuyServiceImpl.java        | 23 +++++++++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
index 063bff81..436cc598 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
@@ -82,4 +82,7 @@ public class CourseCatalogueEntity{
     @TableField(exist = false)
     private List<CourseCatalogueChapterEntity> STChapterList;
 
+    @TableField(exist = false)
+    private String courseTitle;
+
 }
diff --git a/src/main/java/com/peanut/modules/common/vo/AddCoursesFrag.java b/src/main/java/com/peanut/modules/common/vo/AddCoursesFrag.java
index 0db93509..174accb7 100644
--- a/src/main/java/com/peanut/modules/common/vo/AddCoursesFrag.java
+++ b/src/main/java/com/peanut/modules/common/vo/AddCoursesFrag.java
@@ -16,4 +16,6 @@ public class AddCoursesFrag {
     private String tel;
 
     private boolean frag;
+
+    private String describe;
 }
diff --git a/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java
index 2b41e318..790db591 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java
@@ -2,6 +2,7 @@ package com.peanut.modules.master.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.modules.common.dao.CourseCatalogueDao;
 import com.peanut.modules.common.dao.MyUserDao;
 import com.peanut.modules.common.dao.ShopProductCourseDao;
@@ -20,10 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 @Slf4j
 @Service("masterUserCourseBuyService")
@@ -85,6 +83,19 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
         ArrayList<AddCoursesFrag> falseList = new ArrayList<>();
         ArrayList<AddCoursesFrag> successList = new ArrayList<>();
         String[] cata = (addCourses.getCatalogue_id()).split(",");
+        HashMap<String, String> describeMap = new HashMap<>();
+        for (String s : cata){
+            MPJLambdaWrapper<CourseCatalogueEntity> courseCatalogueEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
+            courseCatalogueEntityMPJLambdaWrapper.selectAs(CourseEntity::getTitle,"courseTitle");
+            courseCatalogueEntityMPJLambdaWrapper.selectAll(CourseCatalogueEntity.class);
+            courseCatalogueEntityMPJLambdaWrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseCatalogueEntity::getCourseId);
+            courseCatalogueEntityMPJLambdaWrapper.eq(CourseCatalogueEntity::getId,s);
+            List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectJoinList(CourseCatalogueEntity.class, courseCatalogueEntityMPJLambdaWrapper);
+            describeMap.put(s+"success",courseCatalogueEntities.get(0).getTitle()+"开通成功");
+            describeMap.put(s+"fail",courseCatalogueEntities.get(0).getTitle()+"开通失败");
+        }
+
+
         CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectById(cata[0]);
         ArrayList<UserCourseBuyEntity> l = new ArrayList<>();
         for (MyUserEntity m : addCourses.getList()){
@@ -100,6 +111,7 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
                     addCoursesFrag.setCourseId(courseCatalogueEntity.getCourseId());
                     addCoursesFrag.setFrag(false);
                     addCoursesFrag.setTel(m.getTel());
+                    addCoursesFrag.setDescribe(describeMap.get(s+"fail"));
                     falseList.add(addCoursesFrag);
                 } else {
                     UserCourseBuyEntity userCourseBuyEntity = new UserCourseBuyEntity();
@@ -116,6 +128,7 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
                     addCoursesFrag.setCourseId(courseCatalogueEntity.getCourseId());
                     addCoursesFrag.setFrag(true);
                     addCoursesFrag.setTel(m.getTel());
+                    addCoursesFrag.setDescribe(describeMap.get(s+"success"));
                     successList.add(addCoursesFrag);
                 }
             }
@@ -159,7 +172,7 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
                         has.add(myUserEntity);
                     }else{
                         HashMap<String, String> stringStringHashMap = new HashMap<>();
-                        stringStringHashMap.put("name",row.getCell(0).toString());
+                        stringStringHashMap.put("name",row.getCell(0)==null?"":row.getCell(0).toString());
                         stringStringHashMap.put("phone",phone);
                         nohas.add(stringStringHashMap);
                     }