Merge branch 'message' into 'master'

feat:[1004974]个人主页消息加类型

See merge request rays/pcloud-book!1360

pcloud-facade-book/src/main/java/com/pcloud/book/applet/enums/AppletRecordTypeEnum.java

@@ -30,7 +30,15 @@ public enum AppletRecordTypeEnum {
 
     SELF_COUPON(21,"自定义优惠券"),
 
-    SYS_COUPON(22,"系统优惠券");
+    SYS_COUPON(22,"系统优惠券"),
+
+    PERSONAL_LIKE(23,"个人页点赞"),
+    CLOCK_LIKE(24,"打卡点赞"),
+    CLOCK_COMMENT(25,"打卡评论")
+
+
+
+    ;
 
     public Integer value;
 

pcloud-facade-book/src/main/java/com/pcloud/book/cultivate/entity/AppletNotifySendDTO.java

@@ -27,4 +27,6 @@ public class AppletNotifySendDTO {
 
     @ApiModelProperty("JSON形式额外信息")
     private String extJson;
+
+    private Integer serveType;
 }

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

@@ -570,7 +570,11 @@ public class CultivateNotifyBizImpl implements CultivateNotifyBiz {
         cultivateNotifyItem.setMessageId(cultivateNotify.getMessageId());
         cultivateNotifyItem.setContentType(4);
         cultivateNotifyItem.setServeId(newSendDTO.getFromId());
+        if(newSendDTO.getServeType()!=null){
+            cultivateNotifyItem.setServeType(newSendDTO.getServeType());
+        }else {
             cultivateNotifyItem.setServeType(AppletRecordTypeEnum.RAISE_QUESTION.value);
+        }
         cultivateNotifyItemDao.insert(Lists.newArrayList(cultivateNotifyItem));
         return cultivateNotify.getMessageId();
     }