From c833ab8f5968c755ded82eea5e8ce2aca841a0cb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 27 九月 2019 15:14:06 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 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 34f6049..f5e3a1f 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
@@ -8,9 +8,12 @@
import org.springframework.stereotype.Service;
import com.google.gson.Gson;
+import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
@@ -235,7 +238,7 @@
coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "浣跨敤鏈埜宸插埌璐︾殑杩斿埄鍐嶈繑" + percent + "%"));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "杩斿埄璁㈠崟宸插埌璐﹀啀杩�" + percent + "%"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -264,7 +267,7 @@
getLeftDay(coupon), coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "浣跨敤鏈埜宸插埌璐︾殑杩斿埄鍐嶈繑" + percent + "%"));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "杩斿埄璁㈠崟宸插埌璐﹀啀杩�" + percent + "%"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -347,6 +350,24 @@
}
}
+
+ @Override
+ public void giveCouponActivateMsg(Long uid, String beiZhu, MsgOtherCouponActivateDTO content) {
+ try {
+ MsgOtherDetail detail = new MsgOtherDetail();
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ detail.setContent(new Gson().toJson(content));
+ detail.setType(MsgTypeOtherTypeEnum.couponActivate);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+
@Override
public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content) {
try {
@@ -381,6 +402,7 @@
}
+
@Override
public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO content) {
try {
@@ -396,4 +418,36 @@
e.printStackTrace();
}
}
+
+ @Override
+ public void firstOrderRewardMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO content) {
+ try {
+ MsgOtherDetail detail = new MsgOtherDetail();
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ detail.setContent(new Gson().toJson(content));
+ detail.setType(MsgTypeOtherTypeEnum.firstOrderReward);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void systemGiveRewardCoupon(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto) {
+ try {
+ MsgOtherDetail detail = new MsgOtherDetail();
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ detail.setContent(new Gson().toJson(dto));
+ detail.setType(MsgTypeOtherTypeEnum.systemGive);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0