Browse Source

用户模块 1:显示订阅信息 0:不显示订阅信息
订阅模块 修复获取订阅开始时间(查询上一个订阅时判断是否已过期)

songfuqiang 2 years ago
parent
commit
0b753cca75

+ 2 - 2
backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/MemberServiceImpl.java

@@ -657,8 +657,8 @@ public class MemberServiceImpl implements MemberService {
         MemberInfoResp memberDetail = getMemberDetail(null);
         memberInfoVo.setType("members");
         memberInfoVo.setMemberInfo(memberDetail.getMemberInfo());
-        //1:显示订阅信息 0:显示订阅信息
-        if("0".equals(subscription)){
+        //1:显示订阅信息 0:显示订阅信息
+        if("1".equals(subscription)){
             memberInfoVo.setSetPricingList(memberDetail.getSetPricingList());
             memberInfoVo.setPricingList(memberDetail.getPricingList());
         }

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

@@ -381,7 +381,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());
+                .andIdNotEqualTo(sub.getId()).andEndDateGreaterThanOrEqualTo(new Date());
         example.setOrderByClause("end_date DESC");
         return subscriptionsMapper.selectByExample(example);
     }