diff --git a/src/main/java/com/peanut/modules/book/controller/BookController.java b/src/main/java/com/peanut/modules/book/controller/BookController.java index ce5c3825..162fa9f7 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookController.java @@ -747,6 +747,8 @@ public class BookController { wrapper1.eq(MedicaldesBook::getTypeId,type); } bookEntityPage = bookService.getBaseMapper().selectPage(new Page<>(page, limit), wrapper1); + }else { + return R.ok().put("page",null); } for (BookEntity b:bookEntityPage.getRecords()){ LambdaQueryWrapper bookForumArticlesEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/peanut/modules/common/controller/UserVipController.java b/src/main/java/com/peanut/modules/common/controller/UserVipController.java index 24c2bbd8..59636f84 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java @@ -110,7 +110,7 @@ public class UserVipController { BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper().eq(BuyOrder::getOrderSn, timeId)); WechatPaymentInfo paymentInfo = new WechatPaymentInfo(); paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); - paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId())); + paymentInfo.setBuyOrderId(buyOrderEntity.getOrderId()); paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); paymentInfo.setAppName(buyOrder.getAppName()); wxpayService.prepay(paymentInfo); @@ -121,7 +121,7 @@ public class UserVipController { buyOrder.getOrderId(), messagePostProcessor() ); - return R.ok().put("orderSn", timeId); + return R.ok().put("orderSn", timeId).put("money",buyOrder.getRealMoney()); } private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice) { diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java index e332b9cc..18e55a62 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -46,4 +46,6 @@ public class CourseEntity { private Integer level; @TableField(exist = false) private Integer selective; + @TableField(exist = false) + private boolean isBuy; } 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 8ceea619..bb5db54f 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 @@ -66,9 +66,9 @@ public class CourseCatalogueChapterVideoServiceImpl extends ServiceImpl userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper() diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java index d7b23dd7..3572f641 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseCatalogueChapterServiceImpl.java @@ -2,10 +2,13 @@ package com.peanut.modules.sociology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.common.utils.ShiroUtils; import com.peanut.modules.common.dao.CourseCatalogueChapterDao; import com.peanut.modules.common.dao.CourseCatalogueChapterVideoDao; +import com.peanut.modules.common.dao.UserCourseBuyDao; import com.peanut.modules.common.entity.CourseCatalogueChapterEntity; import com.peanut.modules.common.entity.CourseCatalogueChapterVideoEntity; +import com.peanut.modules.common.entity.UserCourseBuyEntity; import com.peanut.modules.sociology.service.CourseCatalogueChapterService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +23,8 @@ import java.util.Map; public class CourseCatalogueChapterServiceImpl extends ServiceImpl implements CourseCatalogueChapterService { @Autowired private CourseCatalogueChapterVideoDao courseCatalogueChapterVideoDao; + @Autowired + private UserCourseBuyDao userCourseBuyDao; @Override public List getCourseCatalogueChapterList(int id) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -51,6 +56,12 @@ public class CourseCatalogueChapterServiceImpl extends ServiceImpl userCourseBuyEntities = userCourseBuyDao.selectList(new LambdaQueryWrapper().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, byId.getCatalogueId())); + if (userCourseBuyEntities.size()==1){ + flag.put("buy",userCourseBuyEntities.get(0)); + } + return flag; } 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 28ae4d85..a24ed7fe 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 @@ -62,6 +62,14 @@ public class CourseServiceImpl extends ServiceImpl impl wrapper.eq(CourseToSociologyEntity::getSociologyId,param.getId()); wrapper.orderByAsc(CourseToSociologyEntity::getSort); Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper); + for (CourseEntity c:courseEntityPage.getRecords()){ + Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper().eq(UserCourseBuyEntity::getCourseId, c.getId())); + if(integer>0){ + c.setBuy(true); + }else { + c.setBuy(false); + } + } return courseEntityPage; }