feat:[none] 小程序图书搜索，移除开关

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

@@ -27,80 +27,15 @@ import com.pcloud.book.applet.enums.LabelTypeEnum;
 import com.pcloud.book.base.enums.BookStatusEnum;
 import com.pcloud.book.base.enums.BookTypeEnum;
 import com.pcloud.book.base.exception.BookBizException;
-import com.pcloud.book.book.biz.BookAdviserBiz;
-import com.pcloud.book.book.biz.BookAdviserErpBiz;
-import com.pcloud.book.book.biz.BookAppBiz;
-import com.pcloud.book.book.biz.BookBiz;
-import com.pcloud.book.book.biz.BookFreezeBiz;
-import com.pcloud.book.book.biz.BookFundBiz;
-import com.pcloud.book.book.biz.BookLabelBiz;
-import com.pcloud.book.book.biz.BookProductBiz;
-import com.pcloud.book.book.biz.BookResourceBiz;
-import com.pcloud.book.book.biz.BookSerialNumberBiz;
+import com.pcloud.book.book.biz.*;
 import com.pcloud.book.book.cache.BookCache;
 import com.pcloud.book.book.constant.BookConstant;
-import com.pcloud.book.book.dao.BookAdviserDao;
-import com.pcloud.book.book.dao.BookDao;
-import com.pcloud.book.book.dao.BookEdtionDao;
-import com.pcloud.book.book.dao.BookLabelDao;
-import com.pcloud.book.book.dao.BookLinkDao;
-import com.pcloud.book.book.dao.BookRaysClassifyDao;
-import com.pcloud.book.book.dao.BookTypeDao;
-import com.pcloud.book.book.dao.EdtionRecordDao;
-import com.pcloud.book.book.dao.QrcodeSceneErpDao;
-import com.pcloud.book.book.dao.SeriesBookDao;
-import com.pcloud.book.book.dao.SeriesBookRecordDao;
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAdviserDto;
-import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.BookFreezeDto;
-import com.pcloud.book.book.dto.BookFundDto;
-import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
-import com.pcloud.book.book.dto.BookMinimumSupportDTO;
-import com.pcloud.book.book.dto.BookNameUpdateDTO;
-import com.pcloud.book.book.dto.BookTypeDto;
-import com.pcloud.book.book.dto.BookUniqueNumberDTO;
-import com.pcloud.book.book.dto.CreateBookResultVO;
-import com.pcloud.book.book.dto.CreateBookVO;
-import com.pcloud.book.book.dto.CreateQrcodeVO;
-import com.pcloud.book.book.dto.ERPPublishNumDTO;
-import com.pcloud.book.book.dto.EditionAnalysisListVO;
-import com.pcloud.book.book.dto.EditionAnalysisResultVO;
-import com.pcloud.book.book.dto.EditionAnalysisVO;
-import com.pcloud.book.book.dto.ErpBookApprovalDTO;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.QrcodeServeDto;
-import com.pcloud.book.book.dto.RelateAdviserVO;
-import com.pcloud.book.book.entity.Book;
-import com.pcloud.book.book.entity.BookAdviser;
-import com.pcloud.book.book.entity.BookAdviserErp;
-import com.pcloud.book.book.entity.BookEdition;
-import com.pcloud.book.book.entity.BookLabel;
-import com.pcloud.book.book.entity.BookLink;
-import com.pcloud.book.book.entity.BookSerialNumber;
-import com.pcloud.book.book.entity.EditionRecord;
-import com.pcloud.book.book.entity.QrcodeSceneErp;
-import com.pcloud.book.book.entity.SeriesBook;
-import com.pcloud.book.book.entity.SeriesBookRecord;
-import com.pcloud.book.book.facade.impl.AppletSearchSwitchController;
+import com.pcloud.book.book.dao.*;
+import com.pcloud.book.book.dto.*;
+import com.pcloud.book.book.entity.*;
 import com.pcloud.book.book.set.BookSet;
 import com.pcloud.book.book.tools.BookTools;
-import com.pcloud.book.book.vo.BookCountsVO;
-import com.pcloud.book.book.vo.BookInfo4ScanCount;
-import com.pcloud.book.book.vo.BookLabelVO;
-import com.pcloud.book.book.vo.BookLinkVO;
-import com.pcloud.book.book.vo.BookQualifyVO;
-import com.pcloud.book.book.vo.BookResourceNumDTO;
-import com.pcloud.book.book.vo.BookSaleVO;
-import com.pcloud.book.book.vo.ListNoAuthBookParam;
-import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
-import com.pcloud.book.book.vo.SearchBookVO;
+import com.pcloud.book.book.vo.*;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
@@ -117,11 +52,7 @@ import com.pcloud.book.consumer.message.MessageConsr;
 import com.pcloud.book.consumer.raystask.MainLineConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
 import com.pcloud.book.consumer.trade.TradeConsr;
-import com.pcloud.book.consumer.user.AdviserConsr;
-import com.pcloud.book.consumer.user.AgentConsr;
-import com.pcloud.book.consumer.user.ChannelConsr;
-import com.pcloud.book.consumer.user.MerchantConsr;
-import com.pcloud.book.consumer.user.PartyConsr;
+import com.pcloud.book.consumer.user.*;
 import com.pcloud.book.consumer.wechat.WechatConsr;
 import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
 import com.pcloud.book.copyright.vo.BookAuthInfoVO;
@@ -193,19 +124,7 @@ import org.springframework.util.CollectionUtils;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -2689,16 +2608,6 @@ public class BookBizImpl implements BookBiz {
         return s;
     }
 
-    private Page<ESBookAndAdviser> getESAdviserBooks4Applet(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds, List<Long> subLabelIds, Integer currentPage, Integer numPerPage, List<Long> scecondTempletIds, Integer isAdviserBook, List<Long> adviserIds, Long agentId) {
-        if (AppletSearchSwitchController.useV2Search()) {
-            return esBookAndAdviserBiz.getESAdviserBooks4AppletV2(grayStatus, keyword, templetIds, graLabelIds, subLabelIds,
-                    currentPage, numPerPage,scecondTempletIds, adviserIds, agentId);
-        } else {
-            return esBookAndAdviserBiz.getESAdviserBooks4Applet(grayStatus, keyword, templetIds, graLabelIds, subLabelIds,
-                    currentPage, numPerPage,scecondTempletIds, isAdviserBook, adviserIds, agentId);
-        }
-    }
-
     @Override
     public PageBeanNew<BookDto> getAdviserBooks4Applet(BookSearchParamVO bookSearchParamVO) {
         List<Long> templetIds = new ArrayList<>();
@@ -2733,8 +2642,8 @@ public class BookBizImpl implements BookBiz {
         if (null != agentId) {
            adviserIds = adviserConsr.getByAgentId(agentId);
         }
-        Page<ESBookAndAdviser> esPage = getESAdviserBooks4Applet(grayStatus, keyword, templetIds, graLabelIds, subLabelIds,
-                currentPage, numPerPage,scecondTempletIds, isAdviserBook, adviserIds, agentId);
+        Page<ESBookAndAdviser> esPage = esBookAndAdviserBiz.getESAdviserBooks4AppletV2(grayStatus, keyword, templetIds, graLabelIds, subLabelIds,
+                currentPage, numPerPage,scecondTempletIds, adviserIds, agentId);
 
         List<ESBookAndAdviser> esBookAndAdvisers = esPage.getContent();
         if (ListUtils.isEmpty(esBookAndAdvisers)) {