Merge branch 'feature/1004091-01' into 'master'

feat: [1004091] 本书服务改版

See merge request rays/pcloud-book!1160

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -3973,6 +3973,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
     }
 
     private void updateRightNowItemByRightIdNew(RightsSetting rightsSetting) {
+        rightsSettingCheck.rightsSettingCheckUpdateNew(rightsSetting);
         Long rightsSettingId = rightsSetting.getId();
         List<RightsNowItem> items = new ArrayList<>();
         RightsSettingNow rightsSettingNow = rightsSetting.getRightsSettingNow();

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

 package com.pcloud.book.rightsSetting.check;
 
 import com.pcloud.book.base.exception.BookBizException;
-import com.pcloud.book.cultivate.enums.ReadTypeEnum;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.entity.RightsItemGroup;
 import com.pcloud.book.rightsSetting.entity.RightsNowItem;
@@ -14,10 +13,7 @@ import com.pcloud.book.rightsSetting.enums.RightsWeekTypeEnum;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
 
-import java.util.Collections;
-import java.util.Map.Entry;
 import org.apache.commons.collections.MapUtils;
-import org.apache.lucene.analysis.util.CharArrayMap.EntrySet;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -207,4 +203,32 @@ public class RightsSettingCheck {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "分类为空！");
         }
     }
+
+    public void rightsSettingCheckUpdateNew(RightsSetting rightsSetting) {
+        if (null == rightsSetting) {
+            throw new BookBizException(BookBizException.PARAM_IS_NULL, "参数为空！");
+        }
+        if (RightsTypeEnum.BASE.code.equals(rightsSetting.getStepType())) {
+            if (null == rightsSetting.getRightsSettingType()) {
+                throw new BookBizException(BookBizException.PARAM_IS_NULL, "权益类型为空！");
+            }
+            if (rightsSetting.getRightsSettingType() == 2 && ListUtils.isEmpty(rightsSetting.getRightsSettingBookRelations())) {
+                throw new BookBizException(BookBizException.PARAM_IS_NULL, "RightsSettingBookRelations不能为空！");
+            }
+            if (rightsSetting.getRightsSettingType() == 1 && null == rightsSetting.getFirstClassify()) {
+                throw new BookBizException(BookBizException.PARAM_IS_NULL, "分类为空！");
+            }
+        } else if (RightsTypeEnum.NOW.code.equals(rightsSetting.getStepType())) {
+            if (null != rightsSetting.getRightsSettingNow()) {
+                List<RightsSettingTitle> rightsSettingTitles = rightsSetting.getRightsSettingNow().getNewRightsSettingTitles();
+                if (!ListUtils.isEmpty(rightsSettingTitles)) {
+                    List<Integer> nowTypes = rightsSettingTitles.stream().filter(s -> s.getRightsSettingNowType() != null)
+                            .map(RightsSettingTitle::getRightsSettingNowType).distinct().collect(Collectors.toList());
+                    if (nowTypes.size() < rightsSettingTitles.size()) {
+                        throw new BookBizException(BookBizException.PARAM_IS_NULL, "模块类型重复！");
+                    }
+                }
+            }
+        }
+    }
 }