对应 message-service 的 UserMessage 更新

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/CommentService.java

@@ -9,6 +9,7 @@ import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostMapper;
 import cn.reghao.tnb.content.app.vod.db.mongo.UserCommentMongo;
 import cn.reghao.tnb.content.app.data.model.entity.UserComment;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
+import cn.reghao.tnb.message.api.constant.MsgType;
 import cn.reghao.tnb.user.api.dto.UserCard;
 import cn.reghao.tnb.message.api.dto.UserMessageDto;
 import cn.reghao.tnb.user.api.iface.UserService;
@@ -66,9 +67,10 @@ public class CommentService {
         VideoPost videoPost = videoPostMapper.findByVideoId(postId);
         if (videoPost != null) {
             long publishBy = videoPost.getPublishBy();
+            int msgType = MsgType.commentMsg.getValue();
             String title = "新评论";
             String content = "发表了新评论";
-            UserMessageDto userMessageDto = new UserMessageDto(title, content, publishBy);
+            UserMessageDto userMessageDto = new UserMessageDto(msgType, title, content, publishBy);
             //userService.sendUserMessage(userMessageDto);
         }
     }

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPlayServiceImpl.java

@@ -133,7 +133,7 @@ public class VideoPlayServiceImpl implements VideoPlayService {
         String videoId = mediaProgress.getMediaId();
         double currentTime = mediaProgress.getCurrentTime();
         long createAt = System.currentTimeMillis();
-        boolean ended = mediaProgress.getEnded();
+        boolean ended = mediaProgress.isEnded();
 
         PlayRecord playRecord = playRecordMapper.findByUserIdAndVideoId(userId, videoId);
         if (playRecord == null) {

user/user-service/src/main/java/cn/reghao/tnb/user/app/rpc/UserWalletServiceImpl.java

@@ -4,6 +4,7 @@ import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.jdk.id.SnowFlake;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.common.util.ConstantId;
+import cn.reghao.tnb.message.api.constant.MsgType;
 import cn.reghao.tnb.user.api.dto.ChargeReq;
 import cn.reghao.tnb.message.api.dto.UserMessageDto;
 import cn.reghao.tnb.user.api.dto.WalletChargeDto;
@@ -54,9 +55,10 @@ public class UserWalletServiceImpl implements UserWalletService {
         walletChargeMapper.save(walletCharge);
 
         long loginUser = UserContext.getUserId();
+        int msgType = MsgType.chargeMsg.getValue();
         String title = "充值消息";
         String content = String.format("来自 %s 的充值请求", loginUser);
-        UserMessageDto userMessageDto = new UserMessageDto(title, content, ConstantId.ANONYMOUS_USER_ID);
+        UserMessageDto userMessageDto = new UserMessageDto(msgType, title, content, ConstantId.ANONYMOUS_USER_ID);
         //userService.sendUserMessage(userMessageDto);
     }
 
@@ -81,9 +83,10 @@ public class UserWalletServiceImpl implements UserWalletService {
         walletBillMapper.save(walletBill);
 
         long receiver = walletCharge.getOwner();
+        int msgType = MsgType.chargeMsg.getValue();
         String title = "充值成功";
         String content = String.format("系统同意了您的充值请求");
-        UserMessageDto userMessageDto = new UserMessageDto(title, content, receiver);
+        UserMessageDto userMessageDto = new UserMessageDto(msgType, title, content, receiver);
         //userMessageService.addMessage(userMessageDto);
     }
 
@@ -106,9 +109,10 @@ public class UserWalletServiceImpl implements UserWalletService {
         walletChargeMapper.updateStatus(chargeId, status);
 
         long receiver = walletCharge.getOwner();
+        int msgType = MsgType.chargeMsg.getValue();
         String title = "充值失败";
         String content = String.format("系统拒绝了您的充值请求");
-        UserMessageDto userMessageDto = new UserMessageDto(title, content, receiver);
+        UserMessageDto userMessageDto = new UserMessageDto(msgType, title, content, receiver);
         //userMessageService.addMessage(userMessageDto);
     }