Merge branch 'feat-zyj-1002855' into 'master'

1002855权益分类不能重复

See merge request rays/pcloud-book!697

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/check/RightsSettingCheck.java

@@ -4,12 +4,16 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.rightsSetting.entity.RightsItemGroup;
 import com.pcloud.book.rightsSetting.entity.RightsNowItem;
 import com.pcloud.book.rightsSetting.entity.RightsSetting;
+import com.pcloud.book.rightsSetting.entity.RightsSettingItem;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.extern.slf4j.Slf4j;
 
 @Component("权益设置参数校验")
 @Slf4j
@@ -40,8 +44,21 @@ public class RightsSettingCheck {
         }
         checkRightNowItem(rightsSetting);
         checkRightItemGroups(rightsSetting);
+        checkRightItem(rightsSetting.getRightsSettingWeekItems());
+        checkRightItem(rightsSetting.getRightsSettingLongTermItems());
+    }
+
+    private void checkRightItem(List<RightsSettingItem> list) {
+        if (ListUtils.isEmpty(list)) {
+            return;
+        }
+        List<Long> classifyIds = list.stream().filter(s -> s.getRightsClassifyId() != null).map(RightsSettingItem::getRightsClassifyId).distinct().collect(Collectors.toList());
+        if (classifyIds.size() < list.size()) {
+            throw new BookBizException(BookBizException.PARAM_IS_NULL, "权益分类不能重复！");
+        }
     }
 
+
     private void checkRightItemGroups(RightsSetting rightsSetting) {
         if (rightsSetting==null||ListUtils.isEmpty(rightsSetting.getRightsItemGroups())){
             return;