Merge branch 'refs/heads/dev' into test

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);
     }