Merge branch 'feature/1003584' into 'master'

feat: [1003584] ERP新增质检功能

See merge request rays/pcloud-book!974

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/QrcodeServeDto.java

+package com.pcloud.book.book.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class QrcodeServeDto implements Serializable {
+
+    @ApiModelProperty("作品或应用id")
+    private Long serveId;
+
+    @ApiModelProperty("sceneId")
+    private Long sceneId;
+
+    @ApiModelProperty("社群书id")
+    private Long bookGroupId;
+
+    @ApiModelProperty("类型；APP应用，PRODUCT作品")
+    private String serveType;
+
+    @ApiModelProperty("链接")
+    private String serveUrl;
+
+    @ApiModelProperty("短链")
+    private String shortUrl;
+
+    @ApiModelProperty("应用或作品名称")
+    private String serveName;
+
+    @ApiModelProperty("类型")
+    private String fromType;
+
+    @ApiModelProperty("是否超级作者")
+    private Boolean isSuper;
+
+    @ApiModelProperty("销售价")
+    private Double retailPrice;
+
+    @ApiModelProperty("协议价")
+    private Double dealPrice;
+
+    @ApiModelProperty("图片地址")
+    private String picUrl;
+
+    @ApiModelProperty("描述信息")
+    private String description;
+
+    @ApiModelProperty("类型")
+    private String typeCode;
+
+    @ApiModelProperty("唯一码")
+    private String uniqueNumber;
+
+    @ApiModelProperty("专业")
+    private Long proLabelId;
+
+    @ApiModelProperty("深度")
+    private Long depLabelId;
+
+    @ApiModelProperty("目的")
+    private Long purLabelId;
+
+    @ApiModelProperty("专业")
+    private String proLabelName;
+
+    @ApiModelProperty("深度")
+    private String depLabelName;
+
+    @ApiModelProperty("目的")
+    private String purLabelName;
+
+    @ApiModelProperty("服务创建人")
+    private Long serveCreateUser;
+
+    @ApiModelProperty("服务创建人名称")
+    private String serveCreateUserName;
+
+    @ApiModelProperty("横图")
+    private String transverseImg;;
+}

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -13,6 +13,7 @@ import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
 import com.pcloud.book.book.dto.CreateBookResultVO;
 import com.pcloud.book.book.dto.CreateBookVO;
+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.BookLabel;
@@ -25,6 +26,7 @@ import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
 import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
+import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
@@ -679,4 +681,12 @@ public interface BookBiz {
 	void addCreateInfoToMq(List<CreateBookVO> createBookVOList);
 
 	List<CreateBookResultVO> batchCreateBook4ErpNew(List<CreateBookVO> createBookVOList);
+
+	BookDto getBaseById4Erp(Long bookId,Long channelId,Long adviserId);
+
+	List<BookGroupDTO> getQrcode4Erp(Long bookId, Long channelId, Long adviserId);
+
+	PageBeanNew<QrcodeServeDto> getQrcodeDetail4Erp(Long sceneId, Long bookGroupId, Long channelId, Integer currentPage, Integer numPerPage);
+
+	BookGroupDTO checkQrcodeDetail4Erp(String url);
 }

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

@@ -1141,4 +1141,40 @@ public class BookFacadeImpl implements BookFacade {
         bookBiz.addCreateInfoToMq(createBookVOList);
         return new ResponseDto<>();
     }
+
+    /**
+     * 获取单个书籍基础信息
+     */
+    @ApiOperation("获取单个书籍基础信息(ERP)")
+    @RequestMapping(value = "getBaseById4Erp", method = RequestMethod.GET)
+    public ResponseDto<BookDto> getBaseById4Erp( @RequestParam(value = "bookId") Long bookId,
+                                                 @RequestParam(value = "channelId") Long channelId,
+                                                 @RequestParam(value = "adviserId") Long adviserId )
+            throws BizException {
+        return new ResponseDto<>(bookBiz.getBaseById4Erp(bookId, channelId, adviserId));
+    }
+
+    @ApiOperation("获取书籍下所有二维码信息(ERP)")
+    @GetMapping("getQrcode4Erp")
+    public ResponseDto<?> getQrcode4Erp(@RequestParam(value = "bookId") Long bookId,
+                                        @RequestParam(value = "channelId") Long channelId,
+                                        @RequestParam(value = "adviserId") Long adviserId ) {
+        return new ResponseDto<>(bookBiz.getQrcode4Erp(bookId, channelId, adviserId));
+    }
+
+    @ApiOperation("获取二维码下的应用作品(ERP)")
+    @GetMapping("getQrcodeDetail4Erp")
+    public ResponseDto<?> getQrcodeDetail4Erp(@RequestParam(value = "sceneId", required = false) Long sceneId,
+                                        @RequestParam(value = "bookGroupId", required = false) Long bookGroupId,
+                                          @RequestParam(value = "channelId") Long channelId,
+                                              @RequestParam(value = "currentPage") Integer currentPage,
+                                              @RequestParam(value = "numPerPage") Integer numPerPage) {
+        return new ResponseDto<>(bookBiz.getQrcodeDetail4Erp(sceneId, bookGroupId, channelId, currentPage, numPerPage));
+    }
+
+    @ApiOperation("扫码检查二维码内容(ERP)")
+    @GetMapping("checkQrcodeDetail4Erp")
+    public ResponseDto<?> checkQrcodeDetail4Erp(@RequestParam(value = "url") String url) {
+        return new ResponseDto<>(bookBiz.checkQrcodeDetail4Erp(url));
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java

@@ -438,4 +438,15 @@ public class QrcodeSceneConsr {
 	public Long createQrcodeScene4Erp(QrcodeScene qrcodeScene) {
 		return ResponseHandleUtil.parseResponse(qrcodeSceneService.createQrcodeScene4Erp(qrcodeScene), Long.class);
 	}
+
+	@ParamLog("根据url获取二维码信息")
+	public QrcodeSceneDto getByUrl(String url) {
+		if(url == null) return null;
+		try {
+			return ResponseHandleUtil.parseResponse(qrcodeSceneService.getByUrl(url), QrcodeSceneDto.class);
+		} catch (BizException e) {
+			LOGGER.error("【二维码-渠道(消)】 获取二维码基本信息失败,<ERROR>.[getById]:" + e.getMessage(), e);
+		}
+		return null;
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/ChannelConsr.java

@@ -7,6 +7,7 @@ import com.pcloud.channelcenter.base.exceptions.ChannelBizException;
 import com.pcloud.channelcenter.qrcode.dto.MapResourceCountDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeMessageDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
+import com.pcloud.channelcenter.qrcode.service.QrcodeLocationAssocService;
 import com.pcloud.channelcenter.qrcode.service.QrcodeSceneService;
 import com.pcloud.channelcenter.wechat.entity.AccountSetting;
 import com.pcloud.channelcenter.wechat.service.AccountSettingService;
@@ -20,7 +21,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +48,8 @@ public class ChannelConsr {
 	private QrcodeSceneService qrcodeSceneService;
 	@Autowired
 	private AccountSettingService accountSettingService;
+	@Autowired
+	private QrcodeLocationAssocService qrcodeLocationAssocService;
 
 	/**
 	 * 获取渠道名称
@@ -219,7 +224,7 @@ public class ChannelConsr {
 	}
 
 	/**
-	 * 批量获取现代纸书下所有的二维码
+	 * 批量获取现代纸书下所有二维码的统计信息UV/PV
 	 * @param adviserIds
 	 * @param bookIds
 	 * @param channelIds
@@ -232,4 +237,16 @@ public class ChannelConsr {
 		mapResourceCountDTO.setChannelIds(channelIds);
 		return ResponseHandleUtil.parseList(qrcodeSceneService.listQrcodeScene(mapResourceCountDTO), QrcodeSceneDto.class);
 	}
+
+	public Map<Long, String> listLocationNames(List<Long> locationIds) {
+		if(CollectionUtils.isEmpty(locationIds)){
+			return new HashMap<>();
+		}
+		try {
+			return ResponseHandleUtil.parseMap(qrcodeLocationAssocService.listLocationNames(locationIds), Long.class, String.class);
+		} catch (Exception e) {
+			LOGGER.error("获取二维码位置 " + e.getMessage(), e);
+			throw new ChannelBizException(ChannelBizException.PARAM_IS_NULL, "获取二维码位置失败");
+		}
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java

@@ -287,6 +287,19 @@ public class BookGroupDTO extends BaseDto {
     private Integer groupQrcodePageNum;
     private Integer groupQrcodeLocationId;
     private String groupQrcodeRemark;
+    private String locationName;
+    /**
+     * wechat:公众号码；ali：自有码
+     */
+    private String qrcodeType;
+
+    public String getQrcodeType() {
+        return qrcodeType;
+    }
+
+    public void setQrcodeType(String qrcodeType) {
+        this.qrcodeType = qrcodeType;
+    }
 
     public String getGroupQrcodeLink() {
         return groupQrcodeLink;
@@ -797,6 +810,14 @@ public class BookGroupDTO extends BaseDto {
         this.groupQrcodeRemark = groupQrcodeRemark;
     }
 
+    public String getLocationName() {
+        return locationName;
+    }
+
+    public void setLocationName(String locationName) {
+        this.locationName = locationName;
+    }
+
     @Override
     public String toString() {
         return "BookGroupDTO{" +
@@ -856,4 +877,4 @@ public class BookGroupDTO extends BaseDto {
                 ", adviserId=" + adviserId +
                 '}';
     }
-}
\ No newline at end of file
+}

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -305,7 +305,7 @@
 	   		IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,START_TIME,END_TIME,BA.TEMPLET_ID,BA.SECOND_TEMPLET_ID,
 			BA.GRA_LABEL_ID,BA.SUB_LABEL_ID,BA.VER_LABEL_ID,BA.AREA_LABEL_ID, BA.IS_PRINT isPrint,
 			BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,BA.vol_label_id,if(G.ID IS NULL, 0, 1) isBookGroup, G.id BOOK_GROUP_ID,G.join_group_type,
-			BA.is_open_robot_process,BA.vol_label_id,b.unique_number
+			BA.is_open_robot_process,BA.vol_label_id,b.unique_number,BA.CREATED_DATE
 		FROM
 			BOOK_ADVISER BA	
 		INNER JOIN