|
@@ -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());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|