Merge branch 'feature/crm' into 'master'

[crm]增加获取所有广告主外部接口

See merge request rays/pcloud-book!1357

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/AdvertisingSpaceFacade.java

 package com.pcloud.book.advertising.facade;
 
-import com.pcloud.book.advertising.dto.AdvertisingBrandDTO;
-import com.pcloud.book.advertising.dto.AdvertisingCpaDTO;
-import com.pcloud.book.advertising.dto.AdvertisingSpaceDTO;
-import com.pcloud.book.advertising.dto.AdvertisingWechatMsgDTO;
-import com.pcloud.book.advertising.dto.Book4AdvertisingTagDTO;
-import com.pcloud.book.advertising.dto.GroupTagAddDTO;
-import com.pcloud.book.advertising.dto.GroupTagDTO;
-import com.pcloud.book.advertising.dto.TestParamDTO;
+import com.pcloud.book.advertising.dto.*;
 import com.pcloud.book.advertising.entity.AdvertisingAdviserPermission;
 import com.pcloud.book.advertising.entity.AdvertisingAgentPermission;
 import com.pcloud.book.advertising.entity.AdvertisingBrand;
@@ -29,6 +22,7 @@ import com.pcloud.common.permission.PermissionException;
 
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -1280,4 +1274,8 @@ public interface AdvertisingSpaceFacade {
     @ApiOperation(value = "获得品牌方登录信息", httpMethod = "GET")
     @GetMapping("getBrandLoginInfo")
     public ResponseDto<?> getBrandLoginInfo(@RequestHeader("token") String token) throws PermissionException;
+
+    @ApiOperation(value = "获得所有广告主列表信息", httpMethod = "GET")
+    @RequestMapping("getAllMasterBaseInfo")
+    public ResponseEntity<ResponseDto<List<AdvertisingMasterBaseDTO>>> getAllMasterBaseInfo();
 }

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/impl/AdvertisingSpaceFacadeImpl.java

 package com.pcloud.book.advertising.facade.impl;
 
 import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz;
-import com.pcloud.book.advertising.dto.AdvertisingCpaDTO;
+import com.pcloud.book.advertising.dto.*;
 import com.pcloud.book.advertising.biz.GroupTagBiz;
-import com.pcloud.book.advertising.dto.AdvertisingBrandDTO;
-import com.pcloud.book.advertising.dto.AdvertisingSpaceDTO;
-import com.pcloud.book.advertising.dto.AdvertisingWechatMsgDTO;
-import com.pcloud.book.advertising.dto.Book4AdvertisingTagDTO;
-import com.pcloud.book.advertising.dto.GroupTagAddDTO;
-import com.pcloud.book.advertising.dto.GroupTagDTO;
-import com.pcloud.book.advertising.dto.TestParamDTO;
 import com.pcloud.book.advertising.entity.AdvertisingAdviserPermission;
 import com.pcloud.book.advertising.entity.AdvertisingAgentPermission;
 import com.pcloud.book.advertising.entity.AdvertisingBrand;
@@ -32,6 +25,7 @@ import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ListUtils;
+import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.string.StringUtil;
@@ -39,6 +33,7 @@ import com.pcloud.wechatgroup.message.enums.IsSystem;
 
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -1322,4 +1317,22 @@ public class AdvertisingSpaceFacadeImpl implements AdvertisingSpaceFacade {
         return new ResponseDto<>(map);
     }
 
+    @Override
+    @GetMapping("getAllMasterBaseInfo")
+    public ResponseEntity<ResponseDto<List<AdvertisingMasterBaseDTO>>> getAllMasterBaseInfo() throws BizException {
+        List<AdvertisingMasterDTO> allMaster = advertisingSpaceBiz.getAllMaster();
+        ArrayList<AdvertisingMasterBaseDTO> dtoList = new ArrayList<>();
+        if(allMaster!=null){
+            allMaster.stream().forEach((e)->{
+                AdvertisingMasterBaseDTO baseDto = new AdvertisingMasterBaseDTO();
+                baseDto.setId(e.getId());
+                baseDto.setMasterName(e.getMasterName());
+                baseDto.setCreateTime(e.getCreateTime());
+                baseDto.setUpdateTime(e.getUpdateTime());
+                dtoList.add(baseDto);
+            });
+        }
+        return ResponseHandleUtil.toResponse(dtoList);
+    }
+
 }