Browse Source

用户模块 修正会员时间计算(排除掉targetId为1的订阅)

songfuqiang 2 years ago
parent
commit
87f770eb27

+ 1 - 1
backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/SubscriptionServiceImpl.java

@@ -380,7 +380,7 @@ public class SubscriptionServiceImpl implements SubscriptionService {
         SubscriptionsExample example = new SubscriptionsExample();
         example.createCriteria().andMemberIdEqualTo(members.getId())
                 .andStatusEqualTo(SubscriptionStatusEnum.ACTIVED.value()).andTargetTypeEqualTo(sub.getTargetType())
-                .andIdNotEqualTo(sub.getId()).andEndDateGreaterThanOrEqualTo(new Date());
+                .andIdNotEqualTo(sub.getId()).andEndDateGreaterThanOrEqualTo(new Date()).andTargetIdNotEqualTo(1);
         example.setOrderByClause("end_date DESC");
         return subscriptionsMapper.selectByExample(example);
     }