Merge branch 'feature/1004452' into 'master'

feat: [none] ERP功能优化

See merge request rays/pcloud-book!1243

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

@@ -20,6 +20,9 @@ public class BookQrcodeStatisticsDTO {
     @ApiModelProperty("编辑id")
     private Long adviserId;
 
+    @ApiModelProperty("是否开启小睿流程")
+    private Integer isOpenRobotProcess;
+
     @ApiModelProperty("二维码统计详情")
     private List<QrcodeStatisticsDTO> qrcodeSceneDtoList = Lists.newArrayList();
 

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

+package com.pcloud.book.book.dto;
+
+import lombok.Data;
+
+@Data
+public class BookRequestVO {
+
+    private Long bookId;
+
+    private Long adviserId;
+
+    private Long channelId;
+
+}

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

+package com.pcloud.book.book.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BookStatisticsResultDto {
+
+    private String bookAdviserChannel;
+
+    @ApiModelProperty("图书标识")
+    private Long bookId;
+
+    @ApiModelProperty("运营标识")
+    private Long channelId;
+
+    @ApiModelProperty("编辑id")
+    private Long adviserId;
+
+    @ApiModelProperty("权益数")
+    private Integer rightsCount;
+
+    @ApiModelProperty("权益类型；1：书刊权益；2：分类权益；3：兜底权益；")
+    private Integer rightsType;
+
+}

pcloud-facade-book/src/main/java/com/pcloud/book/book/service/BookAdviserService.java

@@ -9,8 +9,10 @@ import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.dto.BookCountAndAdviserIdDTO;
 import com.pcloud.book.book.dto.BookCountByAdvisersDto;
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookRequestVO;
 import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
 import com.pcloud.book.book.dto.BookRightsSettingDTO;
+import com.pcloud.book.book.dto.BookStatisticsResultDto;
 import com.pcloud.book.book.dto.BookVarietyStatsDto;
 import com.pcloud.book.book.dto.BookVarietyStatsRequestDto;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
@@ -184,4 +186,8 @@ public interface BookAdviserService {
     @GetMapping("getBookIdsByAgentId")
     @ApiOperation("根据agentId获取书籍id")
     void getBookIdsByAgentId(@RequestParam("agentId") Long agentId);
+
+    @PostMapping("getBookRightsCount")
+    @ApiOperation("获取权益数量")
+    ResponseEntity<ResponseDto<Map<String, BookStatisticsResultDto>>> getBookRightsCount(@RequestBody List<BookRequestVO> requestVOS);
 }

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

@@ -14,8 +14,10 @@ import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.dto.BookDataStatisticsDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookQrcodeStatisticsDTO;
+import com.pcloud.book.book.dto.BookRequestVO;
 import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
 import com.pcloud.book.book.dto.BookRightsSettingDTO;
+import com.pcloud.book.book.dto.BookStatisticsResultDto;
 import com.pcloud.book.book.dto.BookVarietyStatsDto;
 import com.pcloud.book.book.dto.BookVarietyStatsRequestDto;
 import com.pcloud.book.book.dto.QrcodeStatisticsDTO;
@@ -245,6 +247,11 @@ public interface BookAdviserBiz {
 	 */
 	BookAdviserDto getOneMainBook(Long bookId);
 
+	/**
+	 * 查询权益数量
+	 */
+	Map<String, BookStatisticsResultDto> getBookRightsCount(List<BookRequestVO> requestVOS);
+
     PageBeanNew<QrCodeVO> getQrList(Long bookId, Long adviserId, Long channelId,Integer type, Integer currentPage, Integer numPerPage);
 
 	/**

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

 package com.pcloud.book.book.biz.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -29,8 +31,10 @@ import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.dto.BookDataStatisticsDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookQrcodeStatisticsDTO;
+import com.pcloud.book.book.dto.BookRequestVO;
 import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
 import com.pcloud.book.book.dto.BookRightsSettingDTO;
+import com.pcloud.book.book.dto.BookStatisticsResultDto;
 import com.pcloud.book.book.dto.BookVarietyStatsDto;
 import com.pcloud.book.book.dto.BookVarietyStatsRequestDto;
 import com.pcloud.book.book.dto.ERPPublishNumDTO;
@@ -1003,7 +1007,6 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 	public PageBeanNew<ErpAdviserBookVO> listAdviserBook4Erp(String isbn, String uniqueNumber, String adviserName, Long agentId, Integer currentPage, Integer numPerPage) {
 		Map<String, Object> paramMap = new HashMap<>();
 		if(!StringUtil.isEmpty(isbn)){
-			isbn = isbn.replaceAll("[/|-]","");
 			String [] nameList = isbn.trim().split("[\u00A0|\u3000|\u0020]");
 			paramMap.put("nameList", Lists.newArrayList(nameList));
 		}
@@ -1097,6 +1100,40 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 	}
 
 	@Override
+	public Map<String, BookStatisticsResultDto> getBookRightsCount(List<BookRequestVO> requestVOS){
+		Map<String, BookStatisticsResultDto> result = MapUtil.newHashMap();
+		if(CollUtil.isEmpty(requestVOS)){
+			return result;
+		}
+		BookStatisticsResultDto dto;
+		Integer rightsCount = 0;
+		Integer rightsType = 0;
+		for (BookRequestVO vo : requestVOS) {
+			if(vo.getBookId() == null || vo.getAdviserId() == null || vo.getChannelId() == null){
+				continue;
+			}
+			String bookAdviserChannel = vo.getBookId() + "_" + vo.getAdviserId() + "_" + vo.getChannelId();
+			String key =  CacheConstant.BOOK  + "bookAdviser:getBookRightsCount:" + bookAdviserChannel;
+			dto = JedisClusterUtils.getJson(key, BookStatisticsResultDto.class);
+			if(dto == null){
+				rightsCount = getRightsettingCounts(vo.getBookId(), vo.getAdviserId(), vo.getChannelId());
+				rightsType = rightsSettingBiz.getRightsTypeByBookId4AppletHome(vo.getBookId(), vo.getAdviserId(), vo.getChannelId());
+				dto = BookStatisticsResultDto.builder()
+						.bookAdviserChannel(bookAdviserChannel)
+						.bookId(vo.getBookId())
+						.adviserId(vo.getAdviserId())
+						.channelId(vo.getChannelId())
+						.rightsCount(rightsCount)
+						.rightsType(rightsType)
+						.build();
+				JedisClusterUtils.setJson(key, dto, 1800);
+			}
+			result.put(bookAdviserChannel, dto);
+		}
+		return result;
+	}
+
+	@Override
 	@ParamLog("获取某本书关联的二维码")
 	public PageBeanNew<QrCodeVO> getQrList(Long bookId, Long adviserId, Long channelId,Integer type, Integer currentPage, Integer numPerPage) {
 		if (null == bookId || null == adviserId || null == channelId || null == currentPage || null == numPerPage ){
@@ -1587,7 +1624,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
         List<Long> robotList =CollUtil.isEmpty(bookGroupList) ? new ArrayList<>() : bookGroupList.stream().filter(a -> null != a.getJoinGroupType() && JoinGroupTypeEnum.ROBOT.getCode().equals(a.getJoinGroupType())).map(a -> a.getId()).distinct().collect(Collectors.toList());
         //（**不包括群二维码）小睿二维码下资源数量
         List<Long> xiaoruiList =CollUtil.isEmpty(bookGroupList) ? new ArrayList<>() : bookGroupList.stream().filter(a -> null != a.getJoinGroupType() && !JoinGroupTypeEnum.GROUP_QRCODE.getCode().equals(a.getJoinGroupType())).map(a -> a.getId()).distinct().collect(Collectors.toList());
-        //分开查3种类型的资源数量
+		//分开查3种类型的资源数量
         //群二维码下资源数量
         Map<Long, BookGroupServeCountDTO> groupQrCodeMap =CollUtil.isEmpty(groupQrcodeList) ? new HashMap<>() : bookGroupServeDao.mapGroupQrcodeServeCount(groupQrcodeList);
         //客服机器人码下资源数量
@@ -1665,7 +1702,10 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		List<Long> sceneIds =CollUtil.isEmpty(qrcodeSceneDtos) ? new ArrayList<>() : qrcodeSceneDtos.stream().map(x -> x.getSceneId()).collect(Collectors.toList());
 		// 企业微信群资源数
 		Map<Long, BookGroupServeCountDTO> bookQrcodeWxworkMap =CollUtil.isEmpty(sceneIds) ? new HashMap<>() : bookQrcodeWxworkBiz.mapWxWorkServeCount4SceneIds(sceneIds, BookQrcodeType.OFFICIAL_ACCOUNTS.getCode());
+		// 查询图书是否开启小睿流程
+		Map<String, BookAdviserDto> bookAdviserMap = bookAdviserBiz.getBookInfoByBookIds(bookIds, adviserIds, channelIds);
 		String bookChannelAdviserId;
+		String bookAdviserChannelId;
 		for (QrcodeSceneDto qrcodeSceneDto : qrcodeSceneDtos) {
 			bookChannelAdviserId = qrcodeSceneDto.getAdviserBookId() + "_" + qrcodeSceneDto.getChannelPartyId() + "_" + qrcodeSceneDto.getAdviserId();
 			bookQrcodeStatisticsDTO = resultMap.get(bookChannelAdviserId);
@@ -1675,6 +1715,10 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 				bookQrcodeStatisticsDTO.setAdviserId(qrcodeSceneDto.getAdviserId());
 				bookQrcodeStatisticsDTO.setBookId(qrcodeSceneDto.getAdviserBookId());
 				bookQrcodeStatisticsDTO.setChannelId(qrcodeSceneDto.getChannelPartyId());
+				bookAdviserChannelId = qrcodeSceneDto.getAdviserBookId() + "_" + qrcodeSceneDto.getAdviserId() + "_" + qrcodeSceneDto.getChannelPartyId();
+				if(CollUtil.isNotEmpty(bookAdviserMap) && bookAdviserMap.containsKey(bookAdviserChannelId)){
+					bookQrcodeStatisticsDTO.setIsOpenRobotProcess(bookAdviserMap.get(bookAdviserChannelId).getIsOpenRobotProcess());
+				}
 				resultMap.put(bookQrcodeStatisticsDTO.getBookChannelAdviserId(), bookQrcodeStatisticsDTO);
 			}
 			QrcodeStatisticsDTO qrcodeStatisticsDTO = new QrcodeStatisticsDTO();

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookAdviserFacade.java

@@ -8,7 +8,9 @@ import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.dto.BookDataStatisticsDTO;
 import com.pcloud.book.book.dto.BookQrcodeStatisticsDTO;
+import com.pcloud.book.book.dto.BookRequestVO;
 import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
+import com.pcloud.book.book.dto.BookStatisticsResultDto;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.vo.AgentBookStatsDetailVO;
@@ -24,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -296,4 +299,7 @@ public interface BookAdviserFacade {
                                         @RequestParam("adviserId") Long adviserId,
                                         @RequestParam("channelId") Long channelId);
 
+    @ApiOperation("获取权益数量")
+    @PostMapping("getBookRightsCount")
+    ResponseDto<Map<String, BookStatisticsResultDto>> getBookRightsCount(@RequestBody List<BookRequestVO> requestVOS);
 }

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

@@ -13,7 +13,9 @@ import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.dto.BookDataStatisticsDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookQrcodeStatisticsDTO;
+import com.pcloud.book.book.dto.BookRequestVO;
 import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
+import com.pcloud.book.book.dto.BookStatisticsResultDto;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
 import com.pcloud.book.book.dto.QrcodeStatisticsDTO;
 import com.pcloud.book.book.entity.BookAdviser;
@@ -400,4 +402,10 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
 		return new ResponseDto<>(bookAdviserBiz.listBookServes4Book(cursor,limit));
 	}
 
+	@ApiOperation("获取权益数量")
+	@PostMapping("getBookRightsCount")
+	@Override
+	public ResponseDto<Map<String, BookStatisticsResultDto>> getBookRightsCount(@RequestBody List<BookRequestVO> requestVOS) {
+		return new ResponseDto<>(bookAdviserBiz.getBookRightsCount(requestVOS));
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/service/impl/BookAdviserServiceImpl.java

@@ -11,8 +11,10 @@ import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.dto.BookCountAndAdviserIdDTO;
 import com.pcloud.book.book.dto.BookCountByAdvisersDto;
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookRequestVO;
 import com.pcloud.book.book.dto.BookResourceStatisticsDTO;
 import com.pcloud.book.book.dto.BookRightsSettingDTO;
+import com.pcloud.book.book.dto.BookStatisticsResultDto;
 import com.pcloud.book.book.dto.BookVarietyStatsDto;
 import com.pcloud.book.book.dto.BookVarietyStatsRequestDto;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
@@ -206,4 +208,10 @@ public class BookAdviserServiceImpl implements BookAdviserService {
 	public void getBookIdsByAgentId(Long agentId) {
 		bookAdviserBiz.getBookIdsByAgentId(agentId);
 	}
+
+	@Override
+	@PostMapping("getBookRightsCount")
+	public ResponseEntity<ResponseDto<Map<String, BookStatisticsResultDto>>> getBookRightsCount(@RequestBody List<BookRequestVO> requestVOS){
+		return ResponseHandleUtil.toResponse(bookAdviserBiz.getBookRightsCount(requestVOS));
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/RightsSettingBiz.java

@@ -69,6 +69,12 @@ public interface RightsSettingBiz {
     RightsSettingDto getRightsSettingByBookId4AppletHome(Long bookId, Long adviserId, Long channelId);
 
     /**
+     * 小程序首页权益类型
+     * 1：书刊权益；2：分类权益；3：兜底权益；
+     */
+    Integer getRightsTypeByBookId4AppletHome(Long bookId, Long adviserId, Long channelId);
+
+    /**
      * 小程序首页本周/长期权益查询
      * @param cilentIp
      * @param rightsSettingId

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

@@ -2565,6 +2565,28 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
     }
 
     @Override
+    @ParamLog(value = "小程序首页权益类型", isAfterReturn = false)
+    public Integer getRightsTypeByBookId4AppletHome(Long bookId, Long adviserId, Long channelId) {
+        //根据书获取权益
+        RightsSettingDto rightsSettingDto = rightsSettingDAO.getByBookId(bookId);
+        if (null != rightsSettingDto && Objects.equals(Boolean.TRUE, rightsSettingDto.getShowState()) ) {
+            return 1;
+        }
+        if (null == rightsSettingDto || !Objects.equals(Boolean.TRUE, rightsSettingDto.getShowState())) {
+            //根据分类获取权益
+            BookAdviserDto adviserDto = bookAdviserBiz.getBase(bookId, channelId, adviserId);
+            if (null != adviserDto) {
+                rightsSettingDto = getByLabel(adviserDto.getTempletId(), adviserDto.getSecondTempletId(), adviserDto.getGraLabelId(),
+                        adviserDto.getSubLabelId(), adviserDto.getVolLabelId(), adviserDto.getVerLabelId(), adviserDto.getThirdTempletId());
+            }
+        }
+        if (null != rightsSettingDto && rightsSettingDto.getId() != null) {
+            return 2;
+        }
+        return 3;
+    }
+
+    @Override
     @ParamLog(value = "小程序首页本周/长期权益查询", isAfterReturn = false)
     public RightsSettingDto getItemByRightsSettingId4AppletHome(Long rightsSettingId, Long wechatUserId, String rightsType,
                                                                 Integer readType, Long bookId, Long adviserId, Long channelId, Integer currentPage, Integer numPerPage,Long officialAccountsId) {

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

@@ -619,7 +619,7 @@
         ba.IS_DELETE = 0
         AND b.IS_DELETE = 0
         <if test="isbn != null">
-            AND (b.ISBN =#{isbn} or b.BOOK_NAME LIKE CONCAT('%', #{isbn}, '%')
+            AND (b.ISBN = REPLACE(REPLACE(#{isbn},"-",""),"/","") or b.BOOK_NAME LIKE CONCAT('%', #{isbn}, '%')
 			<if test="nameList != null and nameList.size > 0">
 				OR (
 				<foreach collection="nameList" close=" " separator=" and " open=" " item="item">