修改退款

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

@@ -1142,7 +1142,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                             .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
                             .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() + 1L));
-                    if (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
+                    if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() + 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
@@ -1151,7 +1151,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                             .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
                             .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() + 1L));
-                    if (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
+                    if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() + 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
@@ -1163,7 +1163,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                         .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() + 1L));
                 if (ObjectUtil.isNotEmpty(one)) {
                     //判断是否升级
-                    if (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
+                    if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() + 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
@@ -1287,37 +1287,43 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());
             if (consumerMember.getMemberType().equals(MemberTypeEnum.NORMAL.getIndex())) {
                 if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
+                    if (consumerMember.getMembershipLevel().compareTo(0L) > 0) {
                     consumerMember.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
                         MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                                 .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
                                 .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() - 1L));
-                    if (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
+                        if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) < 0) {
                             consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
                             consumerMember.setMemberConfigId(one.getId());
                         }
+                    }
                 } else if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
+                    if (consumerMember.getMembershipLevel().compareTo(0L) > 0) {
                         consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
                         MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                                 .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
                                 .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() - 1L));
-                    if (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
+                        if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) < 0) {
                             consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
                             consumerMember.setMemberConfigId(one.getId());
                         }
                     }
+                }
             } else {
+                if (consumerMember.getMembershipLevel().compareTo(0L) > 0) {
                     //查询当前会员类型和下一级的会员配置
                     MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                             .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
                             .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() - 1L));
                     if (ObjectUtil.isNotEmpty(one)) {
                         //判断是否升级
-                    if (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
+                        if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) < 0) {
                             consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
                             consumerMember.setMemberConfigId(one.getId());
                         }
                     }
                 }
+            }
 
             memberProgressLog.setVariableProgress(consumerMember.getMembershipProgress().subtract(membershipProgress));
             consumerMember.setMembershipProgress(membershipProgress);