From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java |  103 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 60 insertions(+), 43 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 463e584..e620488 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,6 +8,7 @@
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
 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;
@@ -64,11 +65,11 @@
 	}
 
 	@Override
-	public void welfareCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money) {
+	public void welfareCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsing(orderId,money,coupon.getStartTime(),
-				coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsing(orderId, money,
+				coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
 					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級"));
@@ -78,11 +79,11 @@
 	}
 
 	@Override
-	public void welfareCouponUsed(UserSystemCoupon coupon,String orderId) {
+	public void welfareCouponUsed(UserSystemCoupon coupon, String orderId) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(getLeftDay(coupon),"瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級",
-				coupon.getStartTime(), coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(orderId,
+				"瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級", coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
 					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
@@ -110,21 +111,23 @@
 		if (coupon == null || coupon.getUid() == null)
 			return;
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
-				.createWelfareCouponAlreadyOutOfDate(coupon.getStartTime(), coupon.getEndTime());
+				.createWelfareCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
+			MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
+					MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜");
+			detail.setCreateTime(coupon.getEndTime());
+			msgOtherDetailService.addMsgOtherDetail(detail);
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void welfareCouponDrawBack(UserSystemCoupon coupon,String orderId) {
+	public void welfareCouponDrawBack(UserSystemCoupon coupon, String orderId) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
-				.createWelfareCouponAlreadyOutOfDate(coupon.getStartTime(), coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponDrawBack(getLeftDay(coupon),
+				orderId, coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
 					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "閫�鍥炲悗渚濈劧鍙湪鏈夋晥鏈熷唴浣跨敤"));
@@ -141,35 +144,35 @@
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鍙湪棣栭〉-鍏嶅崟鍟嗗搧-閫夋嫨鍟嗗搧-浣跨敤"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void freeSheetCouponUsing(UserSystemCoupon coupon) {
+	public void freeSheetCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsing(coupon.getSource(),
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsing(orderId, money,
 				coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void freeSheetCouponUsed(UserSystemCoupon coupon) {
+	public void freeSheetCouponUsed(UserSystemCoupon coupon, String orderId) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsed(getLeftDay(coupon),
-				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(orderId,
+				"瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級", coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -179,11 +182,11 @@
 	public void freeSheetCouponWillOutOfDate(UserSystemCoupon coupon) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponWillOutOfDate(getLeftDay(coupon),
-				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
+				.createWelfareCouponWillOutOfDate(getLeftDay(coupon), coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -193,53 +196,71 @@
 	public void freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponAlreadyOutOfDate(coupon.getSource(),
-				coupon.getStartTime(), coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
+				.createWelfareCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
+			MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
+					MsgTypeOtherTypeEnum.couponMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜");
+			detail.setCreateTime(coupon.getEndTime());
+
+			msgOtherDetailService.addMsgOtherDetail(detail);
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void rewardCouponGet(UserSystemCoupon coupon) {
+	public void freeSheetCouponDrawBack(UserSystemCoupon coupon, String orderId) {
+		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, MsgTypeOtherTypeEnum.couponMianDan, "閫�鍥炲悗渚濈劧鍙湪鏈夋晥鏈熷唴浣跨敤"));
+		} catch (MsgOtherDetailException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void rewardCouponGet(UserSystemCoupon coupon, int percent) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponGet(getLeftDay(coupon),
 				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "杩斿埄宸插埌璐﹀悗鍐嶅鍔辫繑鍒╃殑" + percent + "%"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void rewardCouponUsed(UserSystemCoupon coupon) {
+	public void rewardCouponUsed(UserSystemCoupon coupon, BigDecimal oldFanLiMoney, BigDecimal rewardMoney,
+			String orderId) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
-		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponUsed(getLeftDay(coupon),
-				coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
+		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponUsed(oldFanLiMoney,
+				rewardMoney, orderId);
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
 	}
 
 	@Override
-	public void rewardCouponWillOutOfDate(UserSystemCoupon coupon) {
+	public void rewardCouponWillOutOfDate(UserSystemCoupon coupon, int percent) {
 		if (coupon == null || coupon.getUid() == null)
 			return;
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponWillOutOfDate(
 				getLeftDay(coupon), coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
 			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
+					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "杩斿埄宸插埌璐﹀悗鍐嶅鍔辫繑鍒╃殑" + percent + "%"));
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
@@ -252,17 +273,13 @@
 		MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
 				.createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
 		try {
-			msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
-					coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
+			MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
+					MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜");
+			detail.setCreateTime(coupon.getEndTime());
+			msgOtherDetailService.addMsgOtherDetail(detail);
 		} catch (MsgOtherDetailException e) {
 			e.printStackTrace();
 		}
-	}
-
-	@Override
-	public void freeSheetCouponDrawBack(UserSystemCoupon coupon) {
-		// TODO Auto-generated method stub
-
 	}
 
 }

--
Gitblit v1.8.0