From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 167 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 99 insertions(+), 68 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 59c8034..21bc604 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,13 +1,19 @@
package com.yeshi.fanli.service.impl.msg;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.Date;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
+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;
import com.yeshi.fanli.exception.msg.MsgOtherDetailException;
import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
@@ -41,49 +47,49 @@
coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+ 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(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+ 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(),
- coupon.getEndTime());
+ MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsing(orderId, money,
+ coupon.getStartTime(), coupon.getEndTime());
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+ 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),
- 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, null));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -97,7 +103,7 @@
.createWelfareCouponWillOutOfDate(getLeftDay(coupon), coupon.getStartTime(), coupon.getEndTime());
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -108,10 +114,26 @@
if (coupon == null || coupon.getUid() == null)
return;
MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createWelfareCouponAlreadyOutOfDate(coupon.getStartTime(), coupon.getEndTime());
+ .createWelfareCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
+ try {
+ 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) {
+ 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.couponWelfareMianDan, null));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "閫�鍥炲悗渚濈劧鍙湪鏈夋晥鏈熷唴浣跨敤"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -125,49 +147,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 freeSheetCouponActive(UserSystemCoupon coupon) {
+ public void freeSheetCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money) {
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(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void freeSheetCouponUsing(UserSystemCoupon coupon) {
- 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();
}
@@ -177,11 +185,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();
}
@@ -191,67 +199,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 rewardCouponActive(UserSystemCoupon coupon) {
+ public void rewardCouponUsed(UserSystemCoupon coupon, BigDecimal oldFanLiMoney, BigDecimal rewardMoney,
+ String orderId) {
if (coupon == null || coupon.getUid() == null)
return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponActive(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 rewardCouponUsed(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponUsed(getLeftDay(coupon),
- coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, null));
- } 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();
}
@@ -264,8 +276,27 @@
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 taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO 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.taoLiJin);
+ msgOtherDetailService.addMsgOtherDetail(detail);
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0