修改获取权益会员购买逻辑

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

@@ -666,8 +666,10 @@ public class RedisTask {
                 ConsumerMember consumerMember = consumerMemberService.getOne(new LambdaQueryWrapper<ConsumerMember>().eq(ConsumerMember::getConsumerId, consumerId));
                 consumerMember.setIsRights(YesNoEnum.no.getIndex());
                 if (ObjectUtil.isNotEmpty(consumerMember)) {
+                    String rechargeMembershipExpirationTime = sysConfigService.selectConfigByKey("rechargeMembershipExpirationTime");
                     if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
-                        String rechargeMembershipExpirationTime = sysConfigService.selectConfigByKey("rechargeMembershipExpirationTime");
+                        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>()

share-system/src/main/java/share/system/service/impl/ConsumerWalletServiceImpl.java

@@ -211,7 +211,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         String expirationDateEquityMembership = sysConfigService.selectConfigByKey("expirationDateEquityMembership");
 
         RechargeConf rechargeConf = rechargeConfService.selectRechargeConfById(recharge.getRechargeConfId());
-        if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
+        if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex()) && one.getIsRights().equals(YesNoEnum.no.getIndex())) {
 //            MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
 //                    .eq(MemberConfig::getMembershipLevel, one.getMembershipLevel())
 //                    .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex())
@@ -274,9 +274,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             memberProgressLog.setOperationTime(new Date());
             memberProgressLog.setOperationType(YesNoEnum.yes.getIndex());
             memberProgressLog.setCreateTime(new Date());
-            if (one.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
-                memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), Integer.parseInt(rechargeMembershipExpirationTime)));
-            }
+            memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), Integer.parseInt(rechargeMembershipExpirationTime)));
             if (one.getIsRights().equals(YesNoEnum.yes.getIndex())) {
                 memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), Integer.parseInt(expirationDateEquityMembership)));
             }

share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java

@@ -148,7 +148,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             Date expirationDate = consumerMember.getExpirationDate();
             //减去当前时间
             int i = DateUtils.differentDaysByMillisecond(new Date(), expirationDate);
-            if (i > 365) {
+            if (i > 365 && consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
                 throw new BaseException("目前只能购买两年权益会员");
             }
         }