From e8e2e233af733ca3ba625223e2fd2255165e6b70 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 16:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java
index 7d5bf5a..850210b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
@@ -26,6 +27,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.msg.MsgOtherCouponContentDTOFactory;
import com.yeshi.fanli.util.factory.msg.MsgOtherDetailFactory;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
@Service
public class UserOtherMsgNotificationServiceImpl implements UserOtherMsgNotificationService {
@@ -538,15 +540,17 @@
@Override
- public void vipUpgradeReward(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto) {
+ public void createMsgOtherDetail(Long uid, List<CommonMsgItemVO> listMsg, MsgTypeOtherTypeEnum type) {
try {
+ if (listMsg == null || listMsg.size() == 0) {
+ return;
+ }
MsgOtherDetail detail = new MsgOtherDetail();
- detail.setBeiZhu(beiZhu);
- detail.setCreateTime(new Date());
detail.setRead(false);
+ detail.setType(type);
detail.setUser(new UserInfo(uid));
- detail.setContent(new Gson().toJson(dto));
- detail.setType(MsgTypeOtherTypeEnum.vipUpgradeReward);
+ detail.setContent(new Gson().toJson(listMsg));
+ detail.setCreateTime(new Date());
msgOtherDetailService.addMsgOtherDetail(detail);
} catch (MsgOtherDetailException e) {
e.printStackTrace();
--
Gitblit v1.8.0