zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2024-05-16 13:54:42 +08:00
parent 1b3803074d
commit 7beb2b2b2c
6 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/master/controller/ShopProductController.java
View File

@@ -39,7 +39,7 @@ public class ShopProductController {
if (StringUtils.isNotEmpty(params.get("productName").toString())) {
wrapper.like(ShopProduct::getProductName, params.get("productName"));
}
wrapper.eq(StringUtils.isNotBlank(params.get("goodsType").toString())&&params.get("goodsType").toString()!="00",ShopProduct::getGoodsType,params.get("goodsType").toString());
wrapper.eq((StringUtils.isNotBlank(params.get("goodsType").toString())&&!params.get("goodsType").toString().equals("00")),ShopProduct::getGoodsType,params.get("goodsType").toString());
wrapper.orderByAsc(ShopProduct::getSort);
wrapper.orderByAsc(ShopProduct::getCreateTime);
Page<ShopProduct> res = shopProductService.page(new Page<>(

2
src/main/java/com/peanut/modules/master/service/impl/CourseCatalogueChapterVideoServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl<CourseCa
public CourseCatalogueChapterVideoEntity checkVideo(CourseCatalogueChapterVideoEntity videoEntity) throws Exception {
CourseCatalogueChapterVideoEntity video = this.getById(videoEntity.getId());
if (video.getDuration() == 0) {
asyncService.pushDurationToVideo(video.getId());
asyncService.pushDurationToVideo(video.getId());//获取mp4总时长
}
CourseCatalogueChapterEntity courseCatalogueChapterEntity = courseCatalogueChapterDao.selectById(video.getChapterId());
CourseCatalogueEntity courseCatalogueEntity = courseCatalogueDao.selectById(courseCatalogueChapterEntity.getCatalogueId());

2
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -56,6 +56,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToSociologyEntity::getSociologyId,param.getId());
wrapper.orderByAsc(CourseToSociologyEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
return courseEntityPage;
}
@@ -78,6 +79,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
wrapper.selectAll(CourseEntity.class);
wrapper.leftJoin(CourseToMarketEntity.class,CourseToMarketEntity::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToMarketEntity::getMarketId,param.getId());
wrapper.orderByAsc(CourseToSociologyEntity::getSort);
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
return courseEntityPage;
}