'合并'

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;