Merge remote-tracking branch 'origin/dev' into dev

share-admin/src/main/java/share/web/controller/system/CallbackController.java

@@ -12,8 +12,6 @@ import share.system.domain.vo.SaobeiNotifyResponseVo;
 import share.system.domain.vo.SaobeiNotifyVo;
 import share.system.service.CallbackService;
 
-import javax.servlet.http.HttpServletRequest;
-
 
 /**
  * 支付回调

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

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

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

@@ -213,7 +213,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
 //                    .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex())
 //            );
             String expirationDateEquityMembership = sysConfigService.selectConfigByKey("expirationDateEquityMembership");
-            one.setExpirationDate(DateUtils.addYears(new Date(), Integer.getInteger(expirationDateEquityMembership)));
+            one.setExpirationDate(DateUtils.addYears(new Date(), Integer.parseInt(expirationDateEquityMembership)));
         }
         logger.debug("修改会员用户");
 

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

@@ -214,7 +214,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 //在原来的基础上增加有效期
 
                 consumerMember.setExpirationDate(DateUtils.addYears(DateUtils.parseDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, consumerMember.getExpirationDate())),
-                        Integer.getInteger(expirationDateEquityMembership)));
+                        Integer.parseInt(expirationDateEquityMembership)));
                 extracted(equityMembersOrder, equityMembersOrderConfig, consumerMember, consumerWallet, memberConfigServiceOne);
                 consumerMemberService.updateConsumerMember(consumerMember);
                 logger.debug("权益会员原来的基础上增加有效期");
@@ -224,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())),
-                        Integer.getInteger(expirationDateEquityMembership)));
+                        Integer.parseInt(expirationDateEquityMembership)));
                 extracted(equityMembersOrder, equityMembersOrderConfig, consumerMember, consumerWallet, memberConfigServiceOne);
                 consumerMemberService.updateConsumerMember(consumerMember);
                 logger.debug("修改会员类型为权益会员");

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

@@ -167,7 +167,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
 //            consumerMember.setMemberConfigId(memberConfig.getId());
             consumerMember.setMembershipProgress(BigDecimal.ZERO);
             String rechargeMembershipExpirationTime = sysConfigService.selectConfigByKey("rechargeMembershipExpirationTime");
-            consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.getInteger(rechargeMembershipExpirationTime)));
+            consumerMember.setExpirationDate(DateUtils.addYears(new Date(), Integer.parseInt(rechargeMembershipExpirationTime)));
             consumerMember.setCreateTime(new Date());
             consumerMember.setIsRecharge(YesNoEnum.yes.getIndex());
             consumerMemberService.save(consumerMember);