From 8d0d503700b584dac185d1f2acbad06b00980275 Mon Sep 17 00:00:00 2001 From: wyn <1074145239@qq.com> Date: Thu, 14 May 2026 18:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AF=BE=E7=A8=8B=E8=A1=A8=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/UserVipController.java | 1 + .../common/service/CourseMedicineService.java | 7 ++++ .../impl/CourseMedicineServiceImpl.java | 16 ++++++++ .../service/impl/CourseServiceImpl.java | 37 ++++++++++++++++++- 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/peanut/modules/common/service/CourseMedicineService.java create mode 100644 src/main/java/com/peanut/modules/common/service/impl/CourseMedicineServiceImpl.java 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 923c014..73a6f49 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java @@ -373,6 +373,7 @@ public class UserVipController { String timeId = IdWorker.getTimeId().substring(0, 32); buyOrder.setOrderSn(timeId); buyOrder.setUserId(uid); + buyOrder.setPaymentDate(new Date()); buyOrderService.save(buyOrder); BigDecimal totalPrice = buyOrder.getRealMoney(); if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) { diff --git a/src/main/java/com/peanut/modules/common/service/CourseMedicineService.java b/src/main/java/com/peanut/modules/common/service/CourseMedicineService.java new file mode 100644 index 0000000..1148ea2 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/CourseMedicineService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.CourseMedicine; + +public interface CourseMedicineService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/impl/CourseMedicineServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/CourseMedicineServiceImpl.java new file mode 100644 index 0000000..5dc81b5 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/CourseMedicineServiceImpl.java @@ -0,0 +1,16 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.CourseMedicineDao; +import com.peanut.modules.common.dao.CourseToMedicineDao; +import com.peanut.modules.common.entity.CourseMedicine; +import com.peanut.modules.common.entity.CourseToMedicine; +import com.peanut.modules.common.service.CourseMedicineService; +import com.peanut.modules.common.service.CourseToMedicineService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("commonCourseMedicineService") +public class CourseMedicineServiceImpl extends ServiceImpl implements CourseMedicineService { +} 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 4a737a7..7e6ea5f 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 @@ -1,6 +1,7 @@ package com.peanut.modules.sociology.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -10,9 +11,12 @@ import com.peanut.common.utils.ShiroUtils; import com.peanut.modules.book.service.ShopProductService; import com.peanut.modules.common.dao.*; import com.peanut.modules.common.entity.*; +import com.peanut.modules.common.service.CourseMedicineService; +import com.peanut.modules.common.service.CourseToMedicineService; import com.peanut.modules.common.service.MyUserService; import com.peanut.modules.common.service.UserVipService; import com.peanut.modules.common.to.ParamTo; +import com.peanut.modules.master.service.CourseMedicalService; import com.peanut.modules.sociology.service.CourseService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -52,6 +56,10 @@ public class CourseServiceImpl extends ServiceImpl impl private UserVipDao userVipDao; @Autowired private UserCourseBuyLogDao userCourseBuyLogDao; + @Autowired + private CourseToMedicineService courseToMedicineService; + @Autowired + private CourseMedicineService courseMedicineService; //根据标签获取课程列表 @@ -117,7 +125,14 @@ public class CourseServiceImpl extends ServiceImpl impl Page courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper); return courseEntityPage; } - + public CourseMedicine getCourseMedicinePid(int medicineId){ + CourseMedicine courseMedicine = courseMedicineService.getById(medicineId); + if(courseMedicine.getPid()==0){ + return courseMedicine; + }else{ + return getCourseMedicinePid(courseMedicine.getPid()); + } + } @Override public Map getCourseDetail(Integer id) { Map flag = new HashMap<>(); @@ -163,6 +178,26 @@ public class CourseServiceImpl extends ServiceImpl impl } } } + QueryWrapper courseToMedicineWrapper = new QueryWrapper(); + courseToMedicineWrapper.eq("course_id",course.getId()); + List courseToMedicineList = courseToMedicineService.list(courseToMedicineWrapper); + String content = course.getContent(); + List medicinePids = new ArrayList<>(); + for (CourseToMedicine courseToMedicine:courseToMedicineList){ + CourseMedicine courseMedicine = getCourseMedicinePid(courseToMedicine.getMedicalId()); + if(medicinePids.contains(courseMedicine.getId())){ + continue; + } + if(courseMedicine!=null && courseMedicine.getId()==1){ + content = content+""; + }else if(courseMedicine!=null && courseMedicine.getId()==74){ + content = content+""; + } + if(courseMedicine!=null){ + medicinePids.add(courseMedicine.getId()); + } + } + course.setContent(content); flag.put("course",course); //课程关联商品 if (StringUtils.isNotEmpty(course.getRelationProductIds())){