瀏覽代碼

是否预约逻辑判断更改

ouyang 3 年之前
父節點
當前提交
085e0bcbb2

+ 3 - 0
src/main/java/com/izouma/nineth/domain/Collection.java

@@ -220,5 +220,8 @@ public class Collection extends BaseEntity {
     @ApiModelProperty("购买时间")
     @ApiModelProperty("购买时间")
     private LocalDateTime purchaseTime;
     private LocalDateTime purchaseTime;
 
 
+    @ApiModelProperty("是否预约成功")
     private boolean subscribed;
     private boolean subscribed;
+    @ApiModelProperty("是否有购买资格")
+    private boolean purchaseQualifications;
 }
 }

+ 6 - 2
src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.service;
 package com.izouma.nineth.service;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.annotations.Debounce;
 import com.izouma.nineth.annotations.Debounce;
@@ -208,8 +209,11 @@ public class CollectionService {
                     collectionDTO.setVipSurplus(user.getVipPurchase() - purchase);
                     collectionDTO.setVipSurplus(user.getVipPurchase() - purchase);
                 }
                 }
                 Subscribe subscribe = subscribeRepo.findAllByCollectionIdAndUserId(collection.getId(), user.getId());
                 Subscribe subscribe = subscribeRepo.findAllByCollectionIdAndUserId(collection.getId(), user.getId());
-                if (subscribe.isPurchaseQualifications()){
-                    collectionDTO.setSubscribed(subscribe.isPurchaseQualifications());
+                if (!ObjectUtil.isEmpty(subscribe)){
+                    collectionDTO.setSubscribed(true);
+                    if (subscribe.isPurchaseQualifications()){
+                        collectionDTO.setPurchaseQualifications(subscribe.isPurchaseQualifications());
+                    }
                 }
                 }
             }
             }
         }
         }