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-06-24 14:24:47 +08:00
parent 923c83290f
commit 7e6274b9da
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -315,12 +315,12 @@ public class BuyOrderController {
paymentInfo.setOrderSn(orderSn); paymentInfo.setOrderSn(orderSn);
paymentInfo.setBuyOrderId(buyOrder.getOrderId()); paymentInfo.setBuyOrderId(buyOrder.getOrderId());
paymentInfo.setTotalAmount(totalPrice); 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"); paymentInfo.setAppName("wumen");
} else if (buyOrder.getCome()==1) { } else if (buyOrder.getCome()==1) {
paymentInfo.setAppName("zmzm"); paymentInfo.setAppName("zmzm");
}else {
paymentInfo.setAppName(buyOrder.getAppName());
} }
wxpayService.prepay(paymentInfo); wxpayService.prepay(paymentInfo);
} }

6
src/main/java/com/peanut/modules/common/entity/CourseCatalogueEntity.java
View File

@@ -76,4 +76,10 @@ public class CourseCatalogueEntity{
@TableField(exist = false) @TableField(exist = false)
private Date lastStudyTime; private Date lastStudyTime;
/**
* 试听章节列表
*/
@TableField(exist = false)
private List<CourseCatalogueChapterEntity> STChapterList;
} }

10
src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
View File

@@ -215,7 +215,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
for (CourseCatalogueEntity c :courseCatalogueEntities){ for (CourseCatalogueEntity c :courseCatalogueEntities){
List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, uId).eq(UserCourseBuyEntity::getCatalogueId, c.getId())); 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) { if (userCourseBuyList.size() > 0) {
c.setIsBuy(1); c.setIsBuy(1);
c.setStartTime(userCourseBuyList.get(0).getStartTime()); c.setStartTime(userCourseBuyList.get(0).getStartTime());
@@ -223,6 +223,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
}else { }else {
c.setIsBuy(0); 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); flag.put("catalogues",courseCatalogueEntities);
return flag; return flag;