diff --git a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java index 4c86aaaf..89af01ad 100644 --- a/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java +++ b/src/main/java/com/peanut/modules/common/controller/CourseRelearnController.java @@ -9,13 +9,13 @@ import com.peanut.common.utils.ShiroUtils; import com.peanut.config.Constants; import com.peanut.config.DelayQueueConfig; import com.peanut.modules.book.service.TransactionDetailsService; +import com.peanut.modules.common.dao.CourseToMedicineDao; import com.peanut.modules.common.entity.*; import com.peanut.modules.common.service.BuyOrderService; +import com.peanut.modules.common.service.CourseToPsycheService; import com.peanut.modules.common.service.JfTransactionDetailsService; import com.peanut.modules.common.service.MyUserService; -import com.peanut.modules.master.service.CourseCatalogueService; -import com.peanut.modules.master.service.ShopProductService; -import com.peanut.modules.master.service.UserCourseBuyService; +import com.peanut.modules.master.service.*; import com.peanut.modules.medical.service.CourseService; import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo; import com.peanut.modules.pay.weChatPay.service.WxpayService; @@ -49,6 +49,12 @@ public class CourseRelearnController { @Autowired private CourseCatalogueService courseCatalogueService; @Autowired + private CourseToMedicalService courseToMedicalService; + @Autowired + private CourseToSociologyService courseToSociologyService; + @Autowired + private CourseToPsycheService courseToPsycheService; + @Autowired private ShopProductService shopProductService; @Autowired private BuyOrderService buyOrderService; @@ -94,15 +100,20 @@ public class CourseRelearnController { if (cc != null) { CourseEntity courseEntity = courseService.getById(cc.getCourseId()); if (courseEntity != null) { - List list = userCourseBuyService.list(new MPJLambdaWrapper() - .disableLogicDel()//查询出已删除数据 - .eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()) - .eq(UserCourseBuyEntity::getCatalogueId,params.get("courseCatalogueId"))); - if (list.size() > 0) { - flag = true; - for (UserCourseBuyEntity userCourseBuyEntity : list) { - if (userCourseBuyEntity.getDelFlag()==0) { - flag = false; + int mCount = courseToMedicalService.count(new LambdaQueryWrapper().eq(CourseToMedicine::getCourseId,courseEntity.getId())); + int sCount = courseToSociologyService.count(new LambdaQueryWrapper().eq(CourseToSociologyEntity::getCourseId,courseEntity.getId())); + int pCount = courseToPsycheService.count(new LambdaQueryWrapper().eq(CourseToPsyche::getCourseId,courseEntity.getId())); + if (mCount>0||sCount > 0||pCount > 0){ + List list = userCourseBuyService.list(new MPJLambdaWrapper() + .disableLogicDel()//查询出已删除数据 + .eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()) + .eq(UserCourseBuyEntity::getCatalogueId,params.get("courseCatalogueId"))); + if (list.size() > 0) { + flag = true; + for (UserCourseBuyEntity userCourseBuyEntity : list) { + if (userCourseBuyEntity.getDelFlag()==0) { + flag = false; + } } } } diff --git a/src/main/java/com/peanut/modules/common/service/CourseToMedicineService.java b/src/main/java/com/peanut/modules/common/service/CourseToMedicineService.java new file mode 100644 index 00000000..f5f56939 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/CourseToMedicineService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseToMedicine; + +public interface CourseToMedicineService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/impl/CourseToMedicineServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CourseToMedicineServiceImpl.java new file mode 100644 index 00000000..12f284a5 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/CourseToMedicineServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseToMedicineDao; +import com.peanut.modules.common.entity.CourseToMedicine; +import com.peanut.modules.common.service.CourseToMedicineService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("commonCourseToMedicineService") +public class CourseToMedicineServiceImpl extends ServiceImpl implements CourseToMedicineService { +}