fix(memberCenter): 调整

mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberController.java

@@ -170,11 +170,11 @@ public class MemberController {
         Long userId = SecurityUtils.getUserId();
         MemberPromotion memberPromotion = memberPromotionService.lambdaQuery()
                 .eq(MemberPromotion::getUserId, userId)
-                .eq(MemberPromotion::getPromotionId, promotionId)
+                .eq(Objects.nonNull(promotionId), MemberPromotion::getPromotionId, promotionId)
                 .eq(MemberPromotion::getStatus, PromotionEnum.PARTICIPATE)
                 .one();
 
-        if (Objects.isNull(memberPromotion)) {
+        if (Objects.nonNull(promotionId) && Objects.isNull(memberPromotion)) {
             return R.fail(HttpStatus.SHOW_ERROR_MSG, "未参与活动或已过期");
         }
 

mcwl-framework/src/main/java/com/mcwl/framework/config/RedisConfig.java

@@ -84,7 +84,7 @@ public class RedisConfig extends CachingConfigurerSupport
         standaloneConfig.setPassword(RedisPassword.of("MuYu_Cloud@Redis"));
 
         LettuceClientConfiguration lettuceClientConfig = LettuceClientConfiguration.builder()
-                .commandTimeout(Duration.ofSeconds(2))
+                .commandTimeout(Duration.ofSeconds(10))
                 .shutdownTimeout(Duration.ZERO)
                 .build();
 

mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java

@@ -80,6 +80,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
         lqw.eq(Member::getUserId, userId)
                 // subscriptionStatus不为expired
                 .ne(Member::getSubscriptionStatus, MemberEnum.MEMBER_CENTER_EXPIRED)
+                .ne(Member::getSubscriptionStatus, MemberEnum.MEMBER_CENTER_PENDING)
                 .orderBy(true, false, Member::getEndDate);
         List<Member> memberList = baseMapper.selectList(lqw);
         Member member = new Member();