修改支付回调

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

@@ -510,7 +510,7 @@ 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.setIsRight(YesNoEnum.no.getIndex());
+                consumerMember.setIsRights(YesNoEnum.no.getIndex());
                 if (ObjectUtil.isNotEmpty(consumerMember)) {
                     if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
                         consumerMember.setMemberType(MemberTypeEnum.RECHARGE.getIndex());

share-system/src/main/java/share/system/domain/ConsumerMember.java

@@ -71,7 +71,7 @@ public class ConsumerMember extends BaseEntity {
     /**
      * 是否为权益
      */
-    private Integer isRight;
+    private Integer isRights;
 
     /**
      * 是否删除

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

@@ -178,7 +178,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
         BigDecimal divide = new BigDecimal(0);
         RechargeConf rechargeConf = rechargeConfService.selectRechargeConfById(recharge.getRechargeConfId());
         MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
-                .eq(MemberConfig::getMembershipLevel, 1L)
+                .eq(MemberConfig::getMembershipLevel, one.getMembershipLevel())
                 .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex()));
         one.setExpirationDate(DateUtils.addYears(new Date(), memberConfig.getValidityPeriod().intValue()));
         logger.debug("修改会员用户");

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

@@ -161,7 +161,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                     equityMembersOrderConfig.getValidityPeriod().intValue()));
             newConsumerMember.setMembershipProgress(BigDecimal.ZERO);
             newConsumerMember.setCreateTime(new Date());
-            newConsumerMember.setIsRight(YesNoEnum.yes.getIndex());
+            newConsumerMember.setIsRights(YesNoEnum.yes.getIndex());
             consumerMemberService.save(newConsumerMember);
             logger.debug("新增权益会员");
             Map<String, String> map = new HashMap<>();
@@ -179,6 +179,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
                 consumerMemberService.updateConsumerMember(consumerMember);
                 logger.debug("权益会员原来的基础上增加有效期");
             } else {
+                consumerMember.setIsRights(YesNoEnum.yes.getIndex());
                 //修改会员类型为权益会员
                 consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
                 consumerMember.setMemberConfigId(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()

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

@@ -155,10 +155,10 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             //新增会员
             ConsumerMember consumerMember = new ConsumerMember();
             consumerMember.setConsumerId(recharge.getConsumerId());
-            consumerMember.setMembershipLevel(1L);
+            consumerMember.setMembershipLevel(0L);
             consumerMember.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
             MemberConfig memberConfig = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
-                    .eq(MemberConfig::getMembershipLevel, 1L)
+                    .eq(MemberConfig::getMembershipLevel, 0L)
                     .eq(MemberConfig::getMemberType, MemberTypeEnum.RECHARGE.getIndex()));
             consumerMember.setMemberConfigId(memberConfig.getId());
             consumerMember.setMembershipProgress(BigDecimal.ZERO);

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

@@ -1146,7 +1146,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() + 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
-                } else if (consumerMember.getIsRight().equals(YesNoEnum.yes.getIndex())) {
+                } else if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
                     consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
                     MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                             .eq(MemberConfig::getMemberType, consumerMember.getMemberType())