Merge branch 'fixbug/fixRightsSetting' into 'master'

bug: [none] fixRightsSetting

See merge request rays/pcloud-book!858

pcloud-service-book/src/main/java/com/pcloud/book/applet/facade/AppletHomeFacade.java

@@ -52,6 +52,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Api(description = "小睿小程序首页")
 @RestController("appletHomeFacade")
@@ -541,10 +542,14 @@ public class AppletHomeFacade {
             @CookieValue("userInfo") String userInfo,
             @RequestParam(value = "bookId") @ApiParam("BookId") Long bookId,
             @RequestParam(value = "channelId") @ApiParam("channelId") Long channelId,
-            @RequestParam(value = "rightsSettingId",required = false) @ApiParam("rightsSettingId") Long rightsSettingId,
+            @RequestParam(value = "rightsSettingId",required = false) @ApiParam("rightsSettingId") String rightsSettingId,
             @RequestParam(value = "adviserId") @ApiParam("adviserId") Long adviserId){
         Long wechatUserId = Cookie.getId(userInfo,Cookie._WECHAT_USER_ID);
-        return new ResponseDto<>(appletUserBookcaseBiz.getUserBookInfoByWechatUserId(bookId,channelId,adviserId,rightsSettingId));
+        Long rightsSettingId4Num = null;
+        if (NumberUtil.isNumber(rightsSettingId)) {
+            rightsSettingId4Num = NumberUtil.toLong(rightsSettingId);
+        }
+        return new ResponseDto<>(appletUserBookcaseBiz.getUserBookInfoByWechatUserId(bookId,channelId,adviserId,rightsSettingId4Num));
     }
 
     @ApiOperation("新增用户资源点击记录")