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 impl Page resPage = null; LambdaQueryWrapper 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 impl List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, id).orderByAsc(CourseCatalogueEntity::getSort)); Integer uId = ShiroUtils.getUId(); for (CourseCatalogueEntity c :courseCatalogueEntities){ - Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId())); - c.setIsBuy(integer>0?1:0); + List userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper().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;