From 264f1f7ab9671015d5fe49e5b8f783210150a7dc Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Mon, 17 Jun 2024 14:13:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=B4=AD=E4=B9=B0=E5=90=8E=E5=BC=80=E5=A7=8B=E3=80=81?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/entity/CourseCatalogueEntity.java  | 11 +++++++++++
 .../master/service/impl/CourseServiceImpl.java        |  8 +++++---
 .../sociology/service/impl/CourseServiceImpl.java     | 10 ++++++++--
 3 files changed, 24 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 6a0d1086..fb3765d2 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
@@ -60,4 +60,15 @@ public class CourseCatalogueEntity{
      */
     @TableField(exist = false)
     private int buyPeoples;
+    /**
+     * 购买后开始时间
+     */
+    @TableField(exist = false)
+    private Date startTime;
+    /**
+     * 购买后结束时间
+     */
+    @TableField(exist = false)
+    private Date endTime;
+
 }
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
index 4f3a3a09..0d54d0f5 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseServiceImpl.java
@@ -295,9 +295,11 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         Page<ShopProduct> resPage = null;
         LambdaQueryWrapper<ShopProduct> w = new LambdaQueryWrapper<>();
         w.like(ShopProduct::getProductName,param.get("productName"));
-        if (StringUtils.isNotBlank(c.getRelationProductIds())){
-            String[] productIds = c.getRelationProductIds().split(",");
-            w.notIn(ShopProduct::getProductId,productIds);
+        if (c != null) {
+            if (StringUtils.isNotBlank(c.getRelationProductIds())){
+                String[] productIds = c.getRelationProductIds().split(",");
+                w.notIn(ShopProduct::getProductId,productIds);
+            }
         }
         resPage = shopProductDao.selectPage(new Page<>(page, limit), w);
         return resPage;
diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
index 41887b11..e4b0831c 100644
--- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
@@ -121,9 +121,15 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, id).orderByAsc(CourseCatalogueEntity::getSort));
         Integer uId = ShiroUtils.getUId();
         for (CourseCatalogueEntity c :courseCatalogueEntities){
-            Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId()));
-            c.setIsBuy(integer>0?1:0);
+            List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId()));
             c.setCompletion(catalogueCompletion(c));
+            if (userCourseBuyList.size() > 0) {
+                c.setIsBuy(1);
+                c.setStartTime(userCourseBuyList.get(0).getStartTime());
+                c.setEndTime(userCourseBuyList.get(0).getEndTime());
+            }else {
+                c.setIsBuy(0);
+            }
         }
         flag.put("catalogues",courseCatalogueEntities);
         return flag;