充值送积分

src/main/java/com/peanut/modules/book/controller/BookBuyConfigController.java

@@ -1,6 +1,7 @@
 package com.peanut.modules.book.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -97,7 +98,11 @@ public class BookBuyConfigController {
      */
     @RequestMapping("/getVipOrPoint")
     public R getVipOrPoint(@RequestParam("type") String type,@RequestParam("qudao") String qudao){
-        List<BookBuyConfigEntity> bookBuyConfigEntities = bookBuyConfigService.getBaseMapper().selectList(new QueryWrapper<BookBuyConfigEntity>().eq("type",type).eq("qudao",qudao));
+        List<BookBuyConfigEntity> bookBuyConfigEntities = bookBuyConfigService.getBaseMapper()
+                .selectList(new QueryWrapper<BookBuyConfigEntity>()
+                        .and(t->t.eq("effective",0).or(q->q.le("start_time",new Date()).ge("end_time",new Date())))
+                        .eq("type",type)
+                        .eq("qudao",qudao));
 
         return R.ok().put("list",bookBuyConfigEntities);
     }