From 871fc79cca8e63ca08a9854648a20143e7c178bb Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Tue, 30 Apr 2024 09:17:58 +0800 Subject: [PATCH] bug --- .../book/controller/BuyOrderController.java | 3 +-- .../service/impl/BuyOrderServiceImpl.java | 2 +- .../book/service/impl/MyUserServiceImpl.java | 2 +- .../modules/common/entity/CourseEntity.java | 2 ++ .../master/controller/UserVipController.java | 2 +- .../controller/CourseController.java | 6 +++++ .../sociology/service/CourseService.java | 2 +- .../service/impl/CourseServiceImpl.java | 23 +++++++++++++++++-- 8 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 8a0a00bb..b0c1e48e 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.R; import com.peanut.config.Constants; @@ -831,7 +830,7 @@ public class BuyOrderController { * @param totalPrice * @return */ - private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice,boolean sj_check,boolean scqq_check,boolean wylq_check,boolean prescript_b_check) { + private boolean usePeanutCoin(MyUserEntity user, BigDecimal totalPrice, boolean sj_check, boolean scqq_check, boolean wylq_check, boolean prescript_b_check) { if (user.getPeanutCoin().compareTo(totalPrice) >= 0) { user.setPeanutCoin(user.getPeanutCoin().subtract(totalPrice)); if (sj_check){ diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 010748db..3523c124 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -355,7 +355,7 @@ public class BuyOrderServiceImpl extends ServiceImpl impl public Page orderList(BuyOrderListRequestVo requestVo) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(BuyOrder.class); - wrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId,BuyOrder::getUserId); + wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId,BuyOrder::getUserId); wrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()),BuyOrder::getOrderStatus,requestVo.getOrderStatus()); wrapper.eq(BuyOrder::getOrderType,"order"); wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime()); diff --git a/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java index c5e90acb..5393475d 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java @@ -436,7 +436,7 @@ public class MyUserServiceImpl extends ServiceImpl impl public boolean checkUserTelOrEmail(MyUserEntity user) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.ne(MyUserEntity::getId,user.getId()); - wrapper.and(l->l.eq(StringUtils.isNotBlank(user.getTel()),MyUserEntity::getTel,user.getTel()).or().eq(StringUtils.isNotBlank(user.getEmail()),MyUserEntity::getEmail,user.getEmail())); + wrapper.and(l->l.eq(StringUtils.isNotBlank(user.getTel()), MyUserEntity::getTel,user.getTel()).or().eq(StringUtils.isNotBlank(user.getEmail()), MyUserEntity::getEmail,user.getEmail())); MyUserEntity one = getOne(wrapper); return one == null; } 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 74be7638..368162e6 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -34,4 +34,6 @@ public class CourseEntity { private List courseCatalogueEntityList; @TableField(exist = false) private Integer bindId; + @TableField(exist = false) + private Date endTime; } diff --git a/src/main/java/com/peanut/modules/master/controller/UserVipController.java b/src/main/java/com/peanut/modules/master/controller/UserVipController.java index 69987e33..43efaa62 100644 --- a/src/main/java/com/peanut/modules/master/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/master/controller/UserVipController.java @@ -37,7 +37,7 @@ public class UserVipController { public R listByPage(@RequestBody Map params) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); wrapper.selectAll(UserVip.class); - wrapper.leftJoin(MyUserEntity.class,MyUserEntity::getId, UserVip::getUserId); + wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId, UserVip::getUserId); if (params.containsKey("userName")&& StringUtils.isNotEmpty(params.get("userName").toString())) { wrapper.eq(MyUserEntity::getName,params.get("userName")); } diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 73dffadb..c2e50240 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -134,4 +134,10 @@ public class CourseController { return R.ok().put("video",courseCatalogueChapterVideoEntity); } + @RequestMapping("/getMyCourse") + public R getMyCourse(@RequestBody Map map){ + List courses = courseService.getMyCourse(map.get("type")); + return R.ok().put("courses",courses); + } + } diff --git a/src/main/java/com/peanut/modules/sociology/service/CourseService.java b/src/main/java/com/peanut/modules/sociology/service/CourseService.java index d86a2b5f..5e39e7ec 100644 --- a/src/main/java/com/peanut/modules/sociology/service/CourseService.java +++ b/src/main/java/com/peanut/modules/sociology/service/CourseService.java @@ -22,5 +22,5 @@ public interface CourseService extends IService { Map getCourseDetail(Integer id); - + List getMyCourse(int type); } 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 59390e68..7e531219 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 @@ -7,22 +7,24 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.ShiroUtils; import com.peanut.modules.common.dao.*; import com.peanut.modules.common.entity.*; +import com.peanut.modules.common.service.MyUserService; import com.peanut.modules.common.to.ParamTo; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.stream.Collectors; @Slf4j @Service("sociologyCourseService") public class CourseServiceImpl extends ServiceImpl implements CourseService { - + @Autowired + private MyUserService userService; @Autowired private UserToCourseDao userToCourseDao; @Autowired @@ -99,6 +101,23 @@ public class CourseServiceImpl extends ServiceImpl impl return flag; } + @Override + public List getMyCourse(int type) { + Integer uId = ShiroUtils.getUId(); + MyUserEntity userEntity = userService.getById(uId); + if(userEntity.getVip()!="0"){ + + } + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(CourseEntity.class); + wrapper.select(UserCourseBuyEntity::getEndTime); + wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,UserCourseBuyEntity::getCourseId); + wrapper.eq(UserCourseBuyEntity::getUserId,uId); + wrapper.gt(UserCourseBuyEntity::getEndTime,new Date()); + List courseEntities = userCourseBuyDao.selectJoinList(CourseEntity.class, wrapper); + return courseEntities; + } + private Integer catalogueCompletion(CourseCatalogueEntity c){ List courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId())); Integer act = 0;