Merge branch 'dev' into test

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -555,20 +555,10 @@ public class RedisTask {
             Long consumerId = jsonObject.getLong("consumerId");
             if (expirationTime.getTime() < new Date().getTime()) {
                 ConsumerMember consumerMember = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, consumerId));
-                consumerMember.setIsRights(YesNoEnum.no.getIndex());
                 if (ObjectUtil.isNotEmpty(consumerMember)) {
+                    consumerMember.setIsRights(YesNoEnum.no.getIndex());
                     String rechargeMembershipExpirationTime = sysConfigService.selectConfigByKey("rechargeMembershipExpirationTime");
-                    if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
-                        consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.parseInt(rechargeMembershipExpirationTime)));
-                    } else {
-                        consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.parseInt(rechargeMembershipExpirationTime)));
-                    }
-//                    MemberConfig memberConfigServiceOne = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
-////                            .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
-//                            .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())
-//                    );
-//                    consumerMember.setMemberConfigId(memberConfigServiceOne.getId());
-//                    consumerMember.setExpirationDate(DateUtils.addYears(new Date(), memberConfigServiceOne.getValidityPeriod().intValue()));
+                    consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.parseInt(rechargeMembershipExpirationTime)));
                     consumerMemberService.updateConsumerMember(consumerMember);
                 }
                 redisUtil.delete(key);