Merge branch 'feature/1004323' into 'master'

feat: [1004323] ERP异常数据统计与监控、编辑端红榜搜索优化、ERP新增运维环节负责人

See merge request rays/pcloud-book!1214

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

@@ -177,4 +177,8 @@ public interface BookAdviserService {
                                                                                       @RequestParam("channelId") Long channelId,
                                                                                       @RequestParam("adviserId") Long adviserId);
 
+    @PostMapping("getHasWxWorkCode")
+    @ApiOperation("erp获取二维码下面配置了企业微信的二维码")
+    ResponseEntity<ResponseDto<List<Long>>> getHasWxWorkCode(@RequestBody List<Long> sceneIds);
+
 }

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

@@ -360,4 +360,9 @@ public interface BookAdviserBiz {
 	 *  * @param null
 	 */
 	BookDto getLatestAdviserBookByIsbn(String isbn);
+
+	/**
+	 *erp获取二维码下面配置了企业微信的二维码
+	 */
+	List<Long> getHasWxWorkCode(List<Long> sceneIds);
 }

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

@@ -65,4 +65,9 @@ public interface BookQrcodeWxworkBiz {
      * 获取二维码配置的企业微信
      */
     Map<String, BookGroupServeCountDTO> mapWxWorkServeCount4BookIds(List<Long> adviserIds, List<Long> bookIds, List<Long> channelIds, String strSceneIds);
+
+    /**
+     *erp获取二维码下面配置了企业微信的二维码
+     */
+    List<Long> getHasWxWorkCode(List<Long> sceneIds);
 }

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

@@ -2228,4 +2228,13 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
             }
         }
     }
+
+
+	/**
+	 *erp获取二维码下面配置了企业微信的二维码
+	 */
+	@Override
+	public List<Long> getHasWxWorkCode(List<Long> sceneIds) {
+		return bookQrcodeWxworkBiz.getHasWxWorkCode(sceneIds);
+	}
 }

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

@@ -263,4 +263,13 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
         Map<String, BookGroupServeCountDTO> resultMap = list.stream().collect(Collectors.toMap(x -> x.getBookChannelAdviserId(), x -> x, (v1, v2) -> v2));
         return CollUtil.isEmpty(resultMap) ? new HashMap<>() : resultMap;
     }
+
+    @Override
+    public List<Long> getHasWxWorkCode(List<Long> sceneIds) {
+        if(CollUtil.isEmpty(sceneIds)){
+            return new ArrayList<>();
+        }
+        List<Long> result = bookQrcodeWxworkDao.getHasWxWorkCode(sceneIds);
+        return result;
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookQrcodeWxworkDao.java

@@ -56,4 +56,9 @@ public interface BookQrcodeWxworkDao extends BaseDao<BookQrcodeWxwork>{
      * 获取二维码配置的企业微信
      */
     List<BookGroupServeCountDTO> mapWxWorkServeCount4BookIds(List<Long> adviserIds, List<Long> bookIds, List<Long> channelIds, String strSceneIds, Integer bookQrcodeType);
+
+    /**
+     * 获取有配置企业微信的二维码
+     */
+    List<Long> getHasWxWorkCode(List<Long> sceneIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookQrcodeWxworkDaoImpl.java

@@ -75,4 +75,11 @@ public class BookQrcodeWxworkDaoImpl extends BaseDaoImpl<BookQrcodeWxwork> imple
         map.put("bookQrcodeType", bookQrcodeType);
         return getSessionTemplate().selectList(getStatement("mapWxWorkServeCount4BookIds"), map);
     }
+
+    @Override
+    public List<Long> getHasWxWorkCode(List<Long> sceneIds) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("sceneIds", sceneIds);
+        return getSessionTemplate().selectList(getStatement("getHasWxWorkCode"), map);
+    }
 }

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

@@ -373,4 +373,10 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
 	public ResponseDto<?> getLatestAdviserBookByIsbn(@RequestParam("isbn") String isbn) {
 		return new ResponseDto<>(bookAdviserBiz.getLatestAdviserBookByIsbn(isbn));
 	}
+
+	@ApiOperation("erp获取二维码下面配置了企业微信的二维码")
+	@PostMapping("getHasWxWorkCode4Erp")
+	public ResponseDto<?> getHasWxWorkCode4Erp(@RequestBody List<Long> sceneIds) {
+		return new ResponseDto<>(bookAdviserBiz.getHasWxWorkCode(sceneIds));
+	}
 }

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

@@ -195,4 +195,10 @@ public class BookAdviserServiceImpl implements BookAdviserService {
 																				 @RequestParam("adviserId") Long adviserId) {
 		return ResponseHandleUtil.toResponse(bookAdviserBiz.getBookAppletByBookId(bookId, channelId, adviserId));
 	}
+
+	@Override
+	@PostMapping("getHasWxWorkCode")
+	public ResponseEntity<ResponseDto<List<Long>>> getHasWxWorkCode(@RequestBody List<Long> sceneIds) {
+		return ResponseHandleUtil.toResponse(bookAdviserBiz.getHasWxWorkCode(sceneIds));
+	}
 }

pcloud-service-book/src/main/resources/mapper/book/BookQrcodeWxworkDao.xml

@@ -152,4 +152,17 @@
         GROUP BY book_id, channel_id, adviser_id
     </select>
 
+    <select id="getHasWxWorkCode" parameterType="map" resultType="long">
+        SELECT
+        book_qrcode_id
+        FROM
+        book_qrcode_wxwork
+        WHERE
+        book_qrcode_type = 1
+        AND book_qrcode_id IN
+        <foreach collection="sceneIds" item="item" separator="," open="(" close=")">
+            ${item}
+        </foreach>
+    </select>
+
 </mapper>