内容四期

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -6,11 +6,14 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.content.api.dto.column.ContentColumnListDTO;
+import com.gic.content.api.dto.material.ContentMaterialDTO;
 import com.gic.content.api.dto.material.ContentMaterialFrontDTO;
 import com.gic.content.api.dto.material.ContentMaterialShareInfoDTO;
 import com.gic.content.api.enums.ColumnEnum;
+import com.gic.content.api.enums.MaterialSearchSceneEnum;
 import com.gic.content.api.qdto.column.ContentColumnClerkQDTO;
 import com.gic.content.api.qdto.material.ContentMaterialPageFrontQDTO;
+import com.gic.content.api.qdto.material.ContentMaterialPageQDTO;
 import com.gic.content.api.qdto.material.ContentMaterialShareQDTO;
 import com.gic.content.api.service.ContentColumnApiService;
 import com.gic.content.api.service.ContentMaterialApiService;
@@ -105,44 +108,45 @@ public class ContentMaterialController {
             return RestResponse.failure("-777", "参数异常");
         }
         List<Integer> goodsShowStatus = goodsInfoAdaptor.getGoodsShowStatus(contentMaterialQO.getEnterpriseId());
-        ContentMaterialPageFrontQDTO contentMaterialPageFrontQDTO = new ContentMaterialPageFrontQDTO();
-        contentMaterialPageFrontQDTO.setEnterpriseId(contentMaterialQO.getEnterpriseId());
-        contentMaterialPageFrontQDTO.setKeyWord(contentMaterialQO.getSearch());
-        contentMaterialPageFrontQDTO.setContentColumnId(contentMaterialQO.getContentColumnId());
-        contentMaterialPageFrontQDTO.setMaterialType(contentMaterialQO.getMaterialType());
+        ContentMaterialPageQDTO pageQDTO = new ContentMaterialPageQDTO();
+        pageQDTO.setQueryScene(MaterialSearchSceneEnum.HAOBAN_MARKETING.value);
+        pageQDTO.setEnterpriseId(contentMaterialQO.getEnterpriseId());
+        pageQDTO.setSearch(contentMaterialQO.getSearch());
+        pageQDTO.setContentColumnId(contentMaterialQO.getContentColumnId());
+        pageQDTO.setMaterialType(contentMaterialQO.getMaterialType());
 
         if (contentMaterialQO.getSortType() != null) {
             if (contentMaterialQO.getSortType() == 2) {
-                contentMaterialPageFrontQDTO.setHotFlag(1);
+                pageQDTO.setHotFlag(1);
             }
         }
         if (StringUtils.isBlank(contentMaterialQO.getStoreId())) {
             // 区经 获取管辖的权限
             List<String> storeIds = this.clerkStoreAdaptor.queryClerkStoreIds(contentMaterialQO.getClerkId(), contentMaterialQO.getWxEnterpriseId());
-            contentMaterialPageFrontQDTO.setStoreIdList(storeIds);
+            pageQDTO.setStoreIdList(storeIds);
         } else {
-            contentMaterialPageFrontQDTO.setStoreIdList(Collections.singletonList(contentMaterialQO.getStoreId()));
+            pageQDTO.setStoreIdList(Collections.singletonList(contentMaterialQO.getStoreId()));
         }
         if (contentMaterialQO.getSearchType() != null && contentMaterialQO.getSearchType().equals(1)) {
             if (StringUtils.isNotBlank(contentMaterialQO.getSearch())) {
                 // 搜索条件需要置为空
-                contentMaterialPageFrontQDTO.setKeyWord(null);
+                pageQDTO.setSearch(null);
                 List<String> goodsIds = goodsInfoAdaptor.queryGoodsIdWithSearch(contentMaterialQO.getEnterpriseId(), contentMaterialQO.getSearch());
                 if (CollectionUtils.isEmpty(goodsIds)) {
                     log.info("搜索商品不存在 {}", contentMaterialQO.getSearch());
                     return RestResponse.successResult(new Page<>());
                 }
-                contentMaterialPageFrontQDTO.setGoodsIdList(goodsIds);
+                pageQDTO.setGoodsIdList(goodsIds);
             }
         }
         BasePageInfo pageInfo = new BasePageInfo();
         pageInfo.setPageNum(contentMaterialQO.getPageNum());
         pageInfo.setPageSize(contentMaterialQO.getPageSize());
-        ServiceResponse<Page<ContentMaterialFrontDTO>> serviceResponse = contentMaterialApiService.pageMaterialFront(contentMaterialPageFrontQDTO, pageInfo);
+        ServiceResponse<Page<ContentMaterialDTO>> serviceResponse = contentMaterialApiService.pageMaterial(pageQDTO, pageInfo);
         if (!serviceResponse.isSuccess() || CollectionUtils.isEmpty(serviceResponse.getResult().getResult())) {
             return RestResponse.successResult(new Page<>());
         }
-        Page<ContentMaterialFrontDTO> responseResult = serviceResponse.getResult();
+        Page<ContentMaterialDTO> responseResult = serviceResponse.getResult();
         Page<ContentMaterialInfoVO> result = new Page<>();
         result.setTotalCount(responseResult.getTotalCount());
         List<String> goodsIds = responseResult.getResult()
@@ -168,7 +172,7 @@ public class ContentMaterialController {
      * @param item
      * @return
      */
-    private ContentMaterialInfoVO getContentMaterialInfoVO(List<Integer> goodsShowStatus, ContentMaterialFrontDTO item, Map<String, BigDecimal> commissionMap) {
+    private ContentMaterialInfoVO getContentMaterialInfoVO(List<Integer> goodsShowStatus, ContentMaterialDTO item, Map<String, BigDecimal> commissionMap) {
         ContentMaterialInfoVO contentMaterialInfoVO = new ContentMaterialInfoVO();
         BeanUtils.copyProperties(item, contentMaterialInfoVO);
         if (CollectionUtils.isNotEmpty(item.getContentGoodsList())) {