Merge branch 'feature/1007143' into 'release'

feat: [1007143] RAYS码配置一个资源的时候跳转逻辑从前端改到后端

See merge request rays/pcloud-book!1575

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/BookGroupService.java

@@ -311,4 +311,9 @@ public interface BookGroupService {
     @ApiOperation("二维码企微落地页是否配了内容")
     @PostMapping("mapWxworkStateBySceneIds")
     ResponseEntity<ResponseDto<Map<Long, Boolean>>> mapWxworkStateBySceneIds(@RequestBody List<Long> sceneIds);
+
+    @ApiOperation("获取只配置一个资源的跳转地址")
+    @GetMapping("getQrcodeOneServe")
+    public ResponseEntity<ResponseDto<String>> getQrcodeOneServe(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId,
+                                               @RequestParam(value = "sceneId", required = false) Long sceneId);
 }

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

@@ -750,4 +750,20 @@ public class QrcodeSceneConsr {
 		}
 		return null;
 	}
+
+	/**
+	 * 修改二维码是否符合一个资源直接跳转
+	 */
+	public void updateQrcodeOneServeRule(Long sceneId, Integer isOneServeJump, String serveJumpUrl, Long serveRuleVersion) throws BizException {
+		if (sceneId == null) {
+			return;
+ 		}
+		try {
+			qrcodeSceneService.updateQrcodeOneServeRule(sceneId, isOneServeJump,serveJumpUrl,serveRuleVersion);
+		} catch (BizException e) {
+			LOGGER.warn("【修改二维码是否符合一个资源直接跳转,<ERROR>.[qrcodeSceneService.updateQrcodeOneServeRule]:" + e.getMessage(), e);
+		} catch (Exception e) {
+			LOGGER.error("【修改二维码是否符合一个资源直接跳转,<ERROR>.[qrcodeSceneService.updateQrcodeOneServeRule]:" + e.getMessage(), e);
+		}
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java

@@ -133,6 +133,10 @@ public interface ResourcePageBiz {
      */
     Long updateResourcePageAndColumn(UpdateResourcePageVO updateResourcePageVO);
 
+    public String getQrcodeOneServe(Long bookGroupId,Long sceneId,Boolean ignoreRays);
+
+    void updateQrcodeOneServe(Long bookGroupId,Long sceneId,Boolean ignoreRays);
+
     /**
      * 客户端根据rays码id查资源页基本配置
      * @author：zhuyajie

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

@@ -189,6 +189,12 @@ public class ResourcePageFacade {
         return new ResponseDto<>(resourcePageBiz.updateResourcePageAndColumn(updateResourcePageVO));
     }
 
+    @GetMapping("getQrcodeOneServe")
+    public ResponseDto<?> getQrcodeOneServe(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId,
+                                               @RequestParam(value = "sceneId", required = false) Long sceneId) {
+        return new ResponseDto<>(resourcePageBiz.getQrcodeOneServe(bookGroupId,sceneId,null));
+    }
+
     @ApiOperation("客户端-根据rays码id查资源页基本配置")
     @GetMapping("getResourcePageByBookGroupId4Wechat")
     public ResponseDto<?> getResourcePageByBookGroupId4Wechat(@CookieValue("userInfo") String userInfo,

pcloud-service-book/src/main/java/com/pcloud/book/group/service/impl/BookGroupServiceImpl.java

@@ -528,4 +528,11 @@ public class BookGroupServiceImpl implements BookGroupService {
     public ResponseEntity<ResponseDto<Map<Long, Boolean>>> mapWxworkStateBySceneIds(@RequestBody List<Long> sceneIds) {
         return ResponseHandleUtil.toResponse(resourcePageBiz.mapWxworkStateBySceneIds(sceneIds));
     }
+
+    @Override
+    @GetMapping("getQrcodeOneServe")
+    public ResponseEntity<ResponseDto<String>> getQrcodeOneServe(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId,
+                                               @RequestParam(value = "sceneId", required = false) Long sceneId) {
+        return ResponseHandleUtil.toResponse(resourcePageBiz.getQrcodeOneServe(bookGroupId,sceneId,null));
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageOneServe.java

@@ -59,4 +59,9 @@ public class ResourcePageOneServe extends BaseDto {
     private Boolean hasOfficialAccountsTool;
 
     private Long adviserId;
+
+    /**
+     * 导航使用场景；1：菜单切换；2：功能跳转
+     */
+    private Integer navigationJumpType;
 }