From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java |  122 +++++++++++++++++++---------------------
 1 files changed, 58 insertions(+), 64 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 ddece43..463e584 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,5 +1,6 @@
 package com.yeshi.fanli.service.impl.msg;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import javax.annotation.Resource;
@@ -8,6 +9,7 @@
 
 import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
 import com.yeshi.fanli.exception.msg.MsgOtherDetailException;
 import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
@@ -40,50 +42,50 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponGet(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void welfareCouponActive(UserSystemCoupon coupon) {
+	public void welfareCouponActive(UserSystemCoupon coupon, UserInfo worker) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponActive(getLeftDay(coupon),
-				coupon.getStartTime(), coupon.getEndTime());
+				"鎴愬姛閭�璇烽槦鍛�:" + worker.getNickName(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙湪棣栭〉-鍏嶅崟鍟嗗搧-閫夋嫨鍟嗗搧-浣跨敤"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void welfareCouponUsing(UserSystemCoupon coupon) {
+	public void welfareCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsing(coupon.getStartTime(),
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsing(orderId,money,coupon.getStartTime(),
 				coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void welfareCouponUsed(UserSystemCoupon coupon) {
+	public void welfareCouponUsed(UserSystemCoupon coupon,String orderId) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(getLeftDay(coupon),
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(getLeftDay(coupon),"瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級",
 				coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -96,8 +98,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
 				.createWelfareCouponWillOutOfDate(getLeftDay(coupon), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -110,8 +112,22 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
 				.createWelfareCouponAlreadyOutOfDate(coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
+		} catch (MsgOtherDetailException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void welfareCouponDrawBack(UserSystemCoupon coupon,String orderId) {
+		if (coupon == null || coupon.getUid() == null)
+			return;
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
+				.createWelfareCouponAlreadyOutOfDate(coupon.getStartTime(), coupon.getEndTime());
+		try {
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "閫�鍥炲悗渚濈劧鍙湪鏈夋晥鏈熷唴浣跨敤"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -124,22 +140,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponGet(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponMianDan, null));
-		} catch (MsgOtherDetailException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void freeSheetCouponActive(UserSystemCoupon coupon) {
-		if (coupon == null || coupon.getUid() == null)
-			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponActive(getLeftDay(coupon),
-				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
-		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -152,8 +154,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsing(coupon.getSource(),
 				coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -166,8 +168,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsed(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -180,8 +182,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponWillOutOfDate(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -194,8 +196,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponAlreadyOutOfDate(coupon.getSource(),
 				coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponMianDan, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -208,22 +210,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponGet(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponReward, null));
-		} catch (MsgOtherDetailException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Override
-	public void rewardCouponActive(UserSystemCoupon coupon) {
-		if (coupon == null || coupon.getUid() == null)
-			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponActive(getLeftDay(coupon),
-				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
-		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponReward, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -236,8 +224,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponUsed(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponReward, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -250,8 +238,8 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponWillOutOfDate(
 				getLeftDay(coupon), coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponReward, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -264,11 +252,17 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
 				.createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
-					MsgTypeOtherTypeEnum.couponReward, null));
+			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
+	@Override
+	public void freeSheetCouponDrawBack(UserSystemCoupon coupon) {
+		// TODO Auto-generated method stub
+
+	}
+
 }

--
Gitblit v1.8.0