'合并'

src/main/java/com/futu/course/course/controller/CourseSectionController.java

@@ -0,0 +1,25 @@
+package com.futu.course.course.controller;
+
+import com.futu.course.course.domain.CourseSection;
+import com.futu.course.course.dto.CourseSectionListByIdDto;
+import com.futu.course.course.service.impl.CourseSectionServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author "杨旭朋"
+ * @ClassName: CourseSectionController
+ * @date 2025年05月13日 18:54
+ */
+@RestController
+@RequestMapping("CourseSection")
+public class CourseSectionController {
+    @Autowired
+    private CourseSectionServiceImpl courseSectionService;
+    @PostMapping("CourseSectionListById")
+    public List<CourseSection> CourseSectionListById(@RequestBody CourseSectionListByIdDto courseId){
+        return courseSectionService.CourseSectionListById(courseId.getCourseId());
+    }
+}

src/main/java/com/futu/course/course/dto/CourseSectionListByIdDto.java

@@ -0,0 +1,19 @@
+package com.futu.course.course.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author "杨旭朋"
+ * @ClassName: CourseSectionListByIdDto
+ * @date 2025年05月13日 19:33
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CourseSectionListByIdDto {
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long courseId;
+}

src/main/java/com/futu/course/course/service/impl/CourseSectionServiceImpl.java

@@ -1,11 +1,15 @@
 package com.futu.course.course.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.course.domain.CourseSection;
 import com.futu.course.course.service.CourseSectionService;
 import com.futu.course.course.mapper.CourseSectionMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author yuu
 * @description 针对表【course_section】的数据库操作Service实现
@@ -14,7 +18,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, CourseSection>
     implements CourseSectionService{
-
+    /**
+     * @title: CourseSectionListById
+     * @desc:  List<CourseSection>
+     * @params Long courseId
+     * @return: Result
+     * @author: 杨旭朋
+     * @date: 2025/5/13 19:01
+     */
+    public List<CourseSection> CourseSectionListById(Long courseId) {
+        LambdaQueryWrapper<CourseSection> eq = Wrappers.<CourseSection>lambdaQuery().eq(CourseSection::getCourseId, courseId);
+        return this.list(eq);
+    }
 }
 
 

src/main/java/com/futu/course/course/service/impl/CourseServiceImpl.java

@@ -51,9 +51,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 //    查询首页的课程
     @Override
     public R findAll() {
-
         User user = (User) redisTemplate.opsForValue().get("user");
-
+        System.err.println(1321);
         List<Long> order1Id = order1Mapper.selectObjs(new QueryWrapper<Order1>().eq("user_id", user.getId()).select("id").eq("status",1));
 
         List<Long>  orderItemId=new ArrayList<>();

src/main/java/com/futu/course/cupons/dto/CouponDto.java

@@ -16,4 +16,5 @@ public class CouponDto {
 
 
 
+
 }

src/main/java/com/futu/course/cupons/service/impl/CouponServiceImpl.java

@@ -18,8 +18,11 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
+import static org.springframework.data.elasticsearch.annotations.DateFormat.date;
+
 /**
 * @author yuu
 * @description 针对表【coupon(优惠券)】的数据库操作Service实现
@@ -54,7 +57,8 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon>
         Course course = courseMapper.selectById(primary.getCouponId());
         List<Coupon> list=new ArrayList<>();
         for (Long i:objects){
-            list.add(this.baseMapper.selectOne(new QueryWrapper<Coupon>().eq("id",i).ge("condition_amount",course.getPrice())));
+            Date date1=new Date();
+            list.add(this.baseMapper.selectOne(new QueryWrapper<Coupon>().eq("id",i).ge("condition_amount",course.getPrice()).ge("start_time",date1)));
             System.err.println(list);
         }
         if (list==null){

src/main/java/com/futu/course/pay/controller/PayController.java

@@ -20,7 +20,7 @@ public class PayController {
 
 
   @Autowired
-    private WxPayService wxService;
+  private WxPayService wxService;