Merge branch 'refs/heads/dev' into test

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

@@ -1291,7 +1291,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 (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
@@ -1300,7 +1300,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 (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }
@@ -1312,7 +1312,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 (membershipProgress.compareTo(BigDecimal.valueOf(one.getLimitRequirements())) <= 0) {
                         consumerMember.setMembershipLevel(consumerMember.getMembershipLevel() - 1L);
                         consumerMember.setMemberConfigId(one.getId());
                     }