From 7e6274b9da072a87cd7070bdb7413a2d86e77aac Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 24 Jun 2024 14:24:47 +0800
Subject: [PATCH] bug

---
 .../modules/book/controller/BuyOrderController.java    |  6 +++---
 .../modules/common/entity/CourseCatalogueEntity.java   |  6 ++++++
 .../medical/service/impl/CourseServiceImpl.java        | 10 +++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
index 6733efe7..14dc6689 100644
--- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
+++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
@@ -315,12 +315,12 @@ public class BuyOrderController {
             paymentInfo.setOrderSn(orderSn);
             paymentInfo.setBuyOrderId(buyOrder.getOrderId());
             paymentInfo.setTotalAmount(totalPrice);
-            if (buyOrder.getCome()==2){
+            if(buyOrder.getCome()==null||buyOrder.getCome()==0){
+                paymentInfo.setAppName(buyOrder.getAppName());
+            } else if (buyOrder.getCome()==2){
                 paymentInfo.setAppName("wumen");
             } else if (buyOrder.getCome()==1) {
                 paymentInfo.setAppName("zmzm");
-            }else {
-                paymentInfo.setAppName(buyOrder.getAppName());
             }
             wxpayService.prepay(paymentInfo);
         }
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 fac6a299..063bff81 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
@@ -76,4 +76,10 @@ public class CourseCatalogueEntity{
     @TableField(exist = false)
     private Date lastStudyTime;
 
+    /**
+     * 试听章节列表
+     */
+    @TableField(exist = false)
+    private List<CourseCatalogueChapterEntity> STChapterList;
+
 }
diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
index 3e28556c..24458eec 100644
--- a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
@@ -215,7 +215,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         for (CourseCatalogueEntity c :courseCatalogueEntities){
             List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId()));
             //完成度、上次学习时间
-            catalogueCompletion(c);
+//            catalogueCompletion(c);
             if (userCourseBuyList.size() > 0) {
                 c.setIsBuy(1);
                 c.setStartTime(userCourseBuyList.get(0).getStartTime());
@@ -223,6 +223,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             }else {
                 c.setIsBuy(0);
             }
+            List<CourseCatalogueChapterEntity> courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterEntity>()
+                    .eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()).eq(CourseCatalogueChapterEntity::getIsAudition, 1));
+            for (CourseCatalogueChapterEntity cou:courseCatalogueChapterEntities){
+                List<CourseCatalogueChapterVideoEntity> courseCatalogueChapterVideoEntities = courseCatalogueChapterVideoDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterVideoEntity>()
+                        .eq(CourseCatalogueChapterVideoEntity::getChapterId, cou.getId()));
+                cou.setVideoList(courseCatalogueChapterVideoEntities);
+            }
+            c.setSTChapterList(courseCatalogueChapterEntities);
         }
         flag.put("catalogues",courseCatalogueEntities);
         return flag;