Merge branch 'feature/gradeLabel' into 'master'

feat:[1005218]更新用户学龄段

See merge request rays/pcloud-book!1377

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

@@ -170,11 +170,14 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
     }
 
     private void updateUserGradeLabel(AppletUserBookcase appletUserBookcase) {
-        //用户没有标签，更新用户年级标签
+        //如果书刊能匹配到，更新用户年级标签
+        //用户是否有年级标签
+        Boolean hasLabel = false;
         UserGradeLabelIdDTO labelIdDTO = readerConsr.getUserGrade(appletUserBookcase.getWechatUserId(), appletUserBookcase.getOfficialAccountsId());
         if (null != labelIdDTO && null != labelIdDTO.getLabelId()) {
-            return;
+            hasLabel = true;
         }
+        //获取书刊匹配的年级标签
         BookAdviserDto bookAdviserDto = bookAdviserBiz.getBase(appletUserBookcase.getBookId(), appletUserBookcase.getChannelId(), appletUserBookcase.getAdviserId());
         if (null == bookAdviserDto) {
             return;
@@ -186,9 +189,12 @@ public class AppletUserBookcaseBizImpl implements AppletUserBookcaseBiz {
         if (null != bookAdviserDto.getDepLabelId()) {
             gradeId = resourcePageBiz.getGradeByDepLabelId(bookAdviserDto.getDepLabelId());
         }
-        //匹配不到，取已工作年龄段
-        gradeId = null == gradeId ? 29L : gradeId;
-        readerConsr.addUserGradeLabel(appletUserBookcase.getWechatUserId(), appletUserBookcase.getOfficialAccountsId(), gradeId);
+        //书刊匹配不到且用户当前没有标签，取已工作年龄段
+        gradeId = (null == gradeId && !hasLabel) ? 29L : gradeId;
+        //更新用户年级标签
+        if (null != gradeId) {
+            readerConsr.addUserGradeLabel(appletUserBookcase.getWechatUserId(), appletUserBookcase.getOfficialAccountsId(), gradeId);
+        }
         //更新用户书籍标签
         if (null != bookAdviserDto.getTempletId()) {
             try {