Merge branch 'feature/H5DefaultGrade' into 'master'

feat: [none] 默认标签

See merge request rays/pcloud-book!1327

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

@@ -171,7 +171,7 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
     private void updateUserGradeLabel(AppletUserBookcase appletUserBookcase) {
         //用户没有标签，更新用户年级标签
         UserGradeLabelIdDTO labelIdDTO = readerConsr.getUserGrade(appletUserBookcase.getWechatUserId(), appletUserBookcase.getOfficialAccountsId());
-        if (null != labelIdDTO) {
+        if (null != labelIdDTO && null != labelIdDTO.getLabelId()) {
             return;
         }
         BookAdviserDto bookAdviserDto = bookAdviserBiz.getBase(appletUserBookcase.getBookId(), appletUserBookcase.getChannelId(), appletUserBookcase.getAdviserId());
@@ -185,9 +185,9 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
         if (null != bookAdviserDto.getDepLabelId()) {
             gradeId = resourcePageBiz.getGradeByDepLabelId(bookAdviserDto.getDepLabelId());
         }
-        if (null != gradeId) {
-            readerConsr.addUserGradeLabel(appletUserBookcase.getWechatUserId(), appletUserBookcase.getOfficialAccountsId(), gradeId);
-        }
+        //匹配不到，取已工作年龄段
+        gradeId = null == gradeId ? 29L : gradeId;
+        readerConsr.addUserGradeLabel(appletUserBookcase.getWechatUserId(), appletUserBookcase.getOfficialAccountsId(), gradeId);
         //更新用户书籍标签
         if (null != bookAdviserDto.getTempletId()) {
             try {