From 9b4aa804ccc0b64ad5a7d85677a0b4d4fb41a606 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 16:59:22 +0800
Subject: [PATCH] 福利中心修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 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 61e3ad6..e5bbc72 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
@@ -235,7 +235,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();
 		}
@@ -250,7 +250,7 @@
 				rewardMoney, orderId);
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜"));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "瀹屾垚閲戝竵浠诲姟锛屽厬鎹㈡洿澶氬鍔卞埜"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -264,7 +264,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();
 		}
@@ -278,7 +278,7 @@
 				.createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
 			MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
-					MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜");
+					MsgTypeOtherTypeEnum.couponReward, "瀹屾垚閲戝竵浠诲姟锛屽厬鎹㈡洿澶氬鍔卞埜");
 			detail.setCreateTime(coupon.getEndTime());
 			msgOtherDetailService.addMsgOtherDetail(detail);
 		} catch (MsgOtherDetailException e) {
@@ -288,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();

--
Gitblit v1.8.0