From bc6df1cbd259c80539d11ae0107ccb938b570266 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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 61e3ad6..92f158d 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();
}
@@ -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();
}
@@ -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