Merge branch 'feature/crm' into 'master'

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

See merge request rays/pcloud-book!1349

pcloud-facade-book/src/main/java/com/pcloud/book/advertising/dto/AdvertisingMasterBaseDTO.java

+package com.pcloud.book.advertising.dto;
+
+import com.pcloud.common.dto.BaseDto;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class AdvertisingMasterBaseDTO extends BaseDto {
+
+    /**
+     * advertising_master.id (唯一标识)
+     */
+    private Long id;
+
+    /**
+     * advertising_master.master_name (广告主名称)
+     */
+    private String masterName;
+
+    /**
+     * advertising_master.create_time (创建时间)
+     */
+    private Date createTime;
+
+    /**
+     * advertising_master.update_time (修改时间)
+     */
+    private Date updateTime;
+}

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

 package com.pcloud.book.advertising.service;
 
+import com.pcloud.book.advertising.dto.AdvertisingMasterBaseDTO;
 import com.pcloud.book.advertising.dto.BrandDataDTO4Channel;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -54,4 +55,8 @@ public interface AdvertisingSpaceService {
     @ApiOperation("品牌方增加的二维码数据")
     @PostMapping("mapBrandQrAddData")
     ResponseEntity<ResponseDto<Map<Long,BrandDataDTO4Channel>>> mapBrandQrAddData(@RequestBody @ApiParam BrandDataDTO4Channel brandDataDTO4Channel);
+
+    @ApiOperation("获取所有广告主列表")
+    @GetMapping("getAllMaster")
+    ResponseEntity<ResponseDto<List<AdvertisingMasterBaseDTO>>> getAllMasterBaseInfo() throws BizException;
 }

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

@@ -4,6 +4,8 @@ import com.pcloud.book.advertising.biz.AdvertisingBrandDataBiz;
 import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz;
 import com.pcloud.book.advertising.biz.GroupTagBiz;
 import com.pcloud.book.advertising.biz.LinkRevertBiz;
+import com.pcloud.book.advertising.dto.AdvertisingMasterBaseDTO;
+import com.pcloud.book.advertising.dto.AdvertisingMasterDTO;
 import com.pcloud.book.advertising.dto.BrandDataDTO4Channel;
 import com.pcloud.book.advertising.service.AdvertisingSpaceService;
 import com.pcloud.book.applet.service.AppletService;
@@ -26,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -109,4 +112,21 @@ public class AdvertisingSpaceServiceImpl implements AdvertisingSpaceService {
         return ResponseHandleUtil.toResponse(advertisingBrandDataBiz.mapBrandQrAddData(brandDataDTO4Channel));
     }
 
+    @Override
+    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);
+    }
+
 }