Merge branch 'refs/heads/test' into test-lms

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

@@ -3,6 +3,7 @@ package share.system.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import share.common.exception.base.BaseException;
 import share.common.utils.DateUtils;
 import share.system.domain.MemberConfig;
 import share.system.mapper.MemberConfigMapper;
@@ -51,6 +52,13 @@ public class MemberConfigServiceImpl extends ServiceImpl<MemberConfigMapper, Mem
      */
     @Override
     public int insertMemberConfig(MemberConfig memberConfig) {
+        // 等级不能重复
+        List<MemberConfig> memberConfigList = list();
+        for (MemberConfig config : memberConfigList) {
+            if (config.getMembershipLevel().equals(memberConfig.getMembershipLevel())) {
+                throw new BaseException("等级不能重复");
+            }
+        }
         memberConfig.setCreateTime(DateUtils.getNowDate());
         return memberConfigMapper.insertMemberConfig(memberConfig);
     }
@@ -63,6 +71,13 @@ public class MemberConfigServiceImpl extends ServiceImpl<MemberConfigMapper, Mem
      */
     @Override
     public int updateMemberConfig(MemberConfig memberConfig) {
+        List<MemberConfig> memberConfigList = list();
+        // 等级不能重复
+        for (MemberConfig config : memberConfigList) {
+            if (config.getMembershipLevel().equals(memberConfig.getMembershipLevel()) && !config.getId().equals(memberConfig.getId())) {
+                throw new BaseException("等级不能重复");
+            }
+        }
         memberConfig.setUpdateTime(DateUtils.getNowDate());
         return memberConfigMapper.updateMemberConfig(memberConfig);
     }

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

@@ -1392,16 +1392,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());
+//                        }
+//                    }
                 }