From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 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 21bc604..70b1c8b 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
@@ -1,7 +1,6 @@
 package com.yeshi.fanli.service.impl.msg;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import javax.annotation.Resource;
@@ -10,6 +9,8 @@
 
 import com.google.gson.Gson;
 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.MsgOtherTaoLiJinContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
@@ -287,6 +288,37 @@
 
 	
 	@Override
+	public void couponDrawBack(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type) {
+		if (coupon == null || coupon.getUid() == null)
+			return;
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponDrawBack(getLeftDay(coupon),
+				orderId, coupon.getStartTime(), coupon.getEndTime());
+		try {
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, type, "閫�鍥炲悗渚濈劧鍙湪鏈夋晥鏈熷唴浣跨敤"));
+		} catch (MsgOtherDetailException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	
+	@Override
+	public void outOfDate(UserSystemCoupon coupon, MsgTypeOtherTypeEnum type) {
+		if (coupon == null || coupon.getUid() == null)
+			return;
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
+				.createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
+		try {
+			MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
+					type, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜");
+			detail.setCreateTime(coupon.getEndTime());
+			msgOtherDetailService.addMsgOtherDetail(detail);
+		} catch (MsgOtherDetailException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@Override
 	public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content) {
 		try {
 			MsgOtherDetail detail = new MsgOtherDetail();
@@ -302,4 +334,37 @@
 		}
 	}
 
+	
+	@Override
+	public void tokenGiveMsg(Long uid, String beiZhu,  MsgOtherGiveContentDTO 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.give);
+			msgOtherDetailService.addMsgOtherDetail(detail);
+		} catch (MsgOtherDetailException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	
+	@Override
+	public void exchangeMsg(Long uid, String beiZhu,  MsgOtherExchangeContentDTO 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.exchange);
+			msgOtherDetailService.addMsgOtherDetail(detail);
+		} catch (MsgOtherDetailException e) {
+			e.printStackTrace();
+		}
+	}
 }

--
Gitblit v1.8.0