Merge branch 'refs/heads/dev' into test

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

@@ -665,9 +665,8 @@ public class RedisTask {
                 consumerMember.setIsRights(YesNoEnum.no.getIndex());
                 if (ObjectUtil.isNotEmpty(consumerMember)) {
                     if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
-                        consumerMember.setExpirationDate(DateUtils.addYears(new Date(), 100));
-                    } else {
-                        consumerMember.setExpirationDate(DateUtils.addYears(new Date(), 100));
+                        String rechargeMembershipExpirationTime = sysConfigService.selectConfigByKey("rechargeMembershipExpirationTime");
+                        consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.getInteger(rechargeMembershipExpirationTime)));
                     }
 //                    MemberConfig memberConfigServiceOne = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
 ////                            .eq(MemberConfig::getMemberType, consumerMember.getMemberType())

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

@@ -57,6 +57,8 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
     private ISCouponService sCouponService;
     @Autowired
     private ISConsumerCouponService consumerCouponService;
+    @Autowired
+    private ISysConfigService sysConfigService;
 
     /**
      * 查询会员钱包
@@ -210,7 +212,8 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
 //                    .eq(MemberConfig::getMembershipLevel, one.getMembershipLevel())
 //                    .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex())
 //            );
-            one.setExpirationDate(DateUtils.addYears(new Date(), 1));
+            String expirationDateEquityMembership = sysConfigService.selectConfigByKey("expirationDateEquityMembership");
+            one.setExpirationDate(DateUtils.addYears(new Date(), Integer.getInteger(expirationDateEquityMembership)));
         }
         logger.debug("修改会员用户");
 

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

@@ -54,6 +54,8 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
     private ConsumerWalletService consumerWalletService;
     @Autowired
     private MemberConfigService memberConfigService;
+    @Autowired
+    private ISysConfigService sysConfigService;
 
     /**
      * 查询充值记录
@@ -164,7 +166,8 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             );
 //            consumerMember.setMemberConfigId(memberConfig.getId());
             consumerMember.setMembershipProgress(BigDecimal.ZERO);
-            consumerMember.setExpirationDate(DateUtils.addYears(new Date(), 100));
+            String rechargeMembershipExpirationTime = sysConfigService.selectConfigByKey("rechargeMembershipExpirationTime");
+            consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.getInteger(rechargeMembershipExpirationTime)));
             consumerMember.setCreateTime(new Date());
             consumerMember.setIsRecharge(YesNoEnum.yes.getIndex());
             consumerMemberService.save(consumerMember);