From 4531e30aa8c266f617bdde662242e36544fa1586 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 12 Jun 2024 10:32:40 +0800
Subject: [PATCH 1/3] bug

---
 .../service/impl/CourseCatalogueChapterVideoServiceImpl.java    | 2 +-
 .../modules/master/service/impl/CourseCatalogueServiceImpl.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
index 8afac0ed..8ceea619 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
@@ -186,7 +186,7 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
         LambdaQueryWrapper<UserCourseBuyEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(UserCourseBuyEntity::getUserId,u.getId());
         wrapper.eq(UserCourseBuyEntity::getCatalogueId,courseCatalogueEntity.getId());
-        wrapper.and(r->r.eq(UserCourseBuyEntity::getEndTime,null).or().gt(UserCourseBuyEntity::getEndTime,new Date()));
+        wrapper.and(r->r.isNull(UserCourseBuyEntity::getEndTime).or().gt(UserCourseBuyEntity::getEndTime,new Date()));
         Integer integer = userCourseBuyDao.selectCount(wrapper);
         return integer>0;
     }
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
index 279016a2..862486b8 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueServiceImpl.java
@@ -127,6 +127,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
         shopProduct.setProductName(courseEntity.getTitle()+"."+courseCatalogue.getTitle()+"(半年)");
         shopProduct.setPrice(courseCatalogue.getHalfFee());
         shopProduct.setGoodsType("05");
+        shopProduct.setProductStock(500);
         shopProduct.setProductImages(courseEntity.getImage());
         shopProductDao.insert(shopProduct);
         //添加半年期的商品课程对应关系
@@ -142,6 +143,7 @@ public class CourseCatalogueServiceImpl extends ServiceImpl<CourseCatalogueDao,
         shopProduct1.setProductName(courseEntity.getTitle()+"."+courseCatalogue.getTitle()+"(一年)");
         shopProduct1.setPrice(courseCatalogue.getFee());
         shopProduct1.setGoodsType("05");
+        shopProduct1.setProductStock(500);
         shopProduct1.setProductImages(courseEntity.getImage());
         shopProductDao.insert(shopProduct1);
         //添加一年期的商品课程对应关系

From b3706ce4456543db4cc03e84ec88182e03746f13 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 12 Jun 2024 11:16:47 +0800
Subject: [PATCH 2/3] bug

---
 .../master/service/impl/CourseSociologyServiceImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
index 7e857d31..2b2f02be 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseSociologyServiceImpl.java
@@ -64,7 +64,8 @@ public class CourseSociologyServiceImpl extends ServiceImpl<CourseSociologyDao,
     }
 
     private List<CourseSociologyEntity> sociologys(int id){
-        List<CourseSociologyEntity> list = this.list(new LambdaQueryWrapper<CourseSociologyEntity>().eq(CourseSociologyEntity::getPid, id));
+        List<CourseSociologyEntity> list = this.list(new LambdaQueryWrapper<CourseSociologyEntity>()
+                .eq(CourseSociologyEntity::getPid, id).orderByAsc(CourseSociologyEntity::getSort));
         for (CourseSociologyEntity c : list){
             if(c.getIsLast()!=1){
                 List<CourseSociologyEntity> so = this.sociologys(c.getId());

From 378785af8a3445ab625d0cd126ffa353f00c0f88 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 12 Jun 2024 11:44:19 +0800
Subject: [PATCH 3/3] bug

---
 .../com/peanut/modules/common/entity/CourseSociologyEntity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java
index 5057faf4..12dcbd25 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseSociologyEntity.java
@@ -24,6 +24,8 @@ public class CourseSociologyEntity {
 
     private Integer sort;
 
+    private String icon;
+
     private String content;
 
     private String media;