修改退款会员降级

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

@@ -1136,31 +1136,26 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 MemberProgressLog memberProgressLog = new MemberProgressLog();
                 memberProgressLog.setConsumerId(sOrder.getConsumerId());
                 memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());
-            if (consumerMember.getMemberType().equals(MemberTypeEnum.NORMAL.getIndex())) {
-                if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
-                    consumerMember.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
+            //查询当前会员类型和下一级的会员配置
             MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
                     .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
                     .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() + 1L));
+            if (consumerMember.getMemberType().equals(MemberTypeEnum.NORMAL.getIndex())) {
+                if (consumerMember.getIsRecharge().equals(YesNoEnum.yes.getIndex())) {
+                    consumerMember.setMemberType(MemberTypeEnum.RECHARGE.getIndex());
+
                     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())) {
                     consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
-                    MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
-                            .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
-                            .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() + 1L));
                     if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() + 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
                 }
             } else {
-                //查询当前会员类型和下一级的会员配置
-                MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
-                        .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
-                        .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel() + 1L));
                 if (ObjectUtil.isNotEmpty(one)) {
                     //判断是否升级
                     if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) >= 0) {
@@ -1285,41 +1280,42 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             MemberProgressLog memberProgressLog = new MemberProgressLog();
             memberProgressLog.setConsumerId(sOrder.getConsumerId());
             memberProgressLog.setCurrentProgress(consumerMember.getMembershipProgress());
+            //查询当前会员类型和当前等级的会员配置
+            MemberConfig one = memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
+                    .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
+                    .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel()));
             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 (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
                             consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
-                            consumerMember.setMemberConfigId(one.getId());
+                            consumerMember.setMemberConfigId(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
+                                    .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
+                                    .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())).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 (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
                             consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
-                            consumerMember.setMemberConfigId(one.getId());
+                            consumerMember.setMemberConfigId(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
+                                    .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
+                                    .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())).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 (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
                             consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
-                            consumerMember.setMemberConfigId(one.getId());
+                            consumerMember.setMemberConfigId(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
+                                    .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
+                                    .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())).getId());
                         }
                     }
                 }