预约逻辑更改

src/main/java/com/izouma/nineth/domain/Collection.java

@@ -224,4 +224,5 @@ public class Collection extends BaseEntity {
     private boolean subscribed;
     @ApiModelProperty("是否有购买资格")
     private boolean purchaseQualifications;
+    private int state;
 }

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -145,5 +145,5 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     Integer getVipQuota(Long id);
 
     @Query("select c.id, c.assetId, c.stock, c.startTime, c.endTime, c.publishTime, c.purchaseTime from Collection c where c.endTime >= ?1 and c.endTime <= ?2")
-    List<Collection> findByStartTimeAfter(LocalDateTime startTime , LocalDateTime endTime);
+    List<Collection> selectStartTimeAfter(LocalDateTime startTime , LocalDateTime endTime);
 }

src/main/java/com/izouma/nineth/repo/SubscribeRepo.java

@@ -17,10 +17,10 @@ public interface SubscribeRepo extends JpaRepository<Subscribe, Long>, JpaSpecif
     @Transactional
     void softDelete(Long id);
 
-    @Query("select s.id, s.collectionId, s.userId, s.purchaseQualifications from Subscribe s where s.collectionId =?1")
+//    @Query("select s.id, s.collectionId, s.userId, s.purchaseQualifications from Subscribe s where s.collectionId =?1")
     List<Subscribe> findAllByCollectionId(Long collectionId);
 
-    @Query("select s.id, s.collectionId, s.userId, s.purchaseQualifications from Subscribe s where s.collectionId =?1 and s.userId = ?2")
+//    @Query("select s.id, s.collectionId, s.userId, s.purchaseQualifications from Subscribe s where s.collectionId =?1 and s.userId = ?2")
     Subscribe findAllByCollectionIdAndUserId(Long collectionId , Long userId);
 
     @Transactional

src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -141,7 +141,7 @@ public class CollectionService {
             if (record.getStartTime().isBefore(LocalDateTime.now())) {
                 record.setOnShelf(true);
                 record.setSalable(true);
-                record.setStartTime(null);
+//                record.setStartTime(null);
             }
         }
         record = collectionRepo.save(record);

src/main/java/com/izouma/nineth/service/scheduledTask/SubscribeTask.java

@@ -29,12 +29,12 @@ public class SubscribeTask {
     @Autowired
     private SubscribeRepo subscribeRepo;
 
-    @Scheduled(cron = "0 0/10 * * * ?")
+//    @Scheduled(cron = "0 0/10 * * * ?")
     public void subscriberTask(){
         ArrayList<Subscribe> subscribes = new ArrayList<>();
         LocalDateTime startTime = LocalDateTime.now();
         LocalDateTime endTime = startTime.plusMinutes(10);
-        List<Collection> collectionList = collectionRepo.findByStartTimeAfter(startTime,endTime);
+        List<Collection> collectionList = collectionRepo.selectStartTimeAfter(startTime,endTime);
         if (Collections.isEmpty(collectionList)){
             log.error("该时间段中并无藏品筛选");
             return;
@@ -56,4 +56,5 @@ public class SubscribeTask {
             }
         });
     }
+
 }

src/main/java/com/izouma/nineth/web/CollectionController.java

@@ -50,7 +50,7 @@ public class CollectionController extends BaseController {
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/create")
     public Collection create(@RequestBody Collection record) {
-        return collectionService.create(record);
+        return collectionService.cre ate(record);
     }
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")