Merge branch 'refs/heads/dev' into test

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

@@ -1354,16 +1354,28 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 //                }
 //            } else {
                 if (consumerMember.getMembershipLevel().compareTo(0L) > 0) {
-
-                    if (ObjectUtil.isNotEmpty(one)) {
-                        //判断是否升级
+                    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(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
-//                                    .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
-//                                    .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())).getId());
+//                        consumerMember.setMemberConfigId(one.getId());
+                        }
+                    } else if (consumerMember.getIsRights().equals(YesNoEnum.yes.getIndex())) {
+//                    consumerMember.setMemberType(MemberTypeEnum.RIGHTS.getIndex());
+                        if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) < 0) {
+                            consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
+//                        consumerMember.setMemberConfigId(one.getId());
                         }
                     }
+//                    if (ObjectUtil.isNotEmpty(one)) {
+//                        //判断是否升级
+//                        if (ObjectUtil.isNotEmpty(one) && membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) < 0) {
+//                            consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
+////                            consumerMember.setMemberConfigId(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>()
+////                                    .eq(MemberConfig::getMemberType, consumerMember.getMemberType())
+////                                    .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())).getId());
+//                        }
+//                    }
                 }