Merge branch 'refs/heads/dev' into test

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

@@ -57,6 +57,8 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
     private IntegralLogService integralLogService;
     @Autowired
     private MemberProgressLogService memberProgressLogService;
+    @Autowired
+    private ISysConfigService sysConfigService;
 
     /**
      * 查询权益会员订单
@@ -207,10 +209,12 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                     .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())
 //                    .eq(MemberConfig::getMemberType, MemberTypeEnum.RIGHTS.getIndex())
             );
+            String expirationDateEquityMembership = sysConfigService.selectConfigByKey("expirationDateEquityMembership");
             if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
                 //在原来的基础上增加有效期
+
                 consumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, consumerMember.getExpirationDate())),
-                        1));
+                        Integer.getInteger(expirationDateEquityMembership)));
                 extracted(equityMembersOrder, equityMembersOrderConfig, consumerMember, consumerWallet, memberConfigServiceOne);
                 consumerMemberService.updateConsumerMember(consumerMember);
                 logger.debug("权益会员原来的基础上增加有效期");
@@ -220,7 +224,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
 //                consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
 //                consumerMember.setMemberConfigId(memberConfigServiceOne.getId());
                 consumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, new Date())),
-                        1));
+                        Integer.getInteger(expirationDateEquityMembership)));
                 extracted(equityMembersOrder, equityMembersOrderConfig, consumerMember, consumerWallet, memberConfigServiceOne);
                 consumerMemberService.updateConsumerMember(consumerMember);
                 logger.debug("修改会员类型为权益会员");