From 51c0049fb70c85bf515dc0fecd96bf13ca23aa28 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 18:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 273 ++++++++----------------------------------------------
1 files changed, 40 insertions(+), 233 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..b172f81 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
@@ -5,15 +5,12 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
-import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
-import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.exception.msg.MsgOtherDetailException;
import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
-import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.factory.msg.MsgOtherCouponContentDTOFactory;
import com.yeshi.fanli.util.factory.msg.MsgOtherDetailFactory;
@Service
@@ -21,254 +18,64 @@
@Resource
private MsgOtherDetailService msgOtherDetailService;
+
- private Integer getLeftDay(UserSystemCoupon coupon) {
- if (coupon != null && coupon.getEndTime() != null) {
- int cha = TimeUtil.getDayDifferenceCount(new Date(), coupon.getEndTime());
- if (cha < 0)
- return 0;
- else
- return cha + 1;
- } else
- return null;
- }
-
- @Override
- public void welfareCouponGet(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponGet(getLeftDay(coupon),
- coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
+ @Transactional(rollbackFor = Exception.class)
+ private void saveMsgDetail(MsgOtherDetail detail) {
try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
+ msgOtherDetailService.addMsgOtherDetail(detail);
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
}
-
+
@Override
- public void welfareCouponActive(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponActive(getLeftDay(coupon),
- coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void freeCouponWinMsg(Long uid, String name, String source, int num, String stateDesc, Date startTime, Date endTime) {
+ saveMsgDetail(MsgOtherDetailFactory.freeCouponMsg(uid, name, source, num, stateDesc, startTime, endTime));
}
-
+
@Override
- public void welfareCouponUsing(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsing(coupon.getStartTime(),
- coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void freeCouponEndMsg(Long uid, String name, String source, int num, String stateDesc) {
+ saveMsgDetail(MsgOtherDetailFactory.freeCouponMsg(uid, name, source, num, stateDesc, null, null));
}
-
+
+
@Override
- public void welfareCouponUsed(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(getLeftDay(coupon),
- coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void rewardCouponWinMsg(Long uid, String source, int num, String stateDesc, Date startTime, Date endTime) {
+ saveMsgDetail(MsgOtherDetailFactory.rewardCouponMsg(uid, source, num, stateDesc, startTime, endTime));
}
-
+
@Override
- public void welfareCouponWillOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createWelfareCouponWillOutOfDate(getLeftDay(coupon), coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void rewardCouponEndMsg(Long uid, String source, int num, String stateDesc) {
+ saveMsgDetail(MsgOtherDetailFactory.rewardCouponMsg(uid, source, num, stateDesc, null, null));
}
-
+
@Override
- public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createWelfareCouponAlreadyOutOfDate(coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponWelfareMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void goldCoinSystemGiveMsg(Long uid, int num, int banlce) {
+ saveMsgDetail(MsgOtherDetailFactory.goldCoinSystemGiveMsg(uid, num, banlce));
}
-
+
@Override
- public void freeSheetCouponGet(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- 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();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void goldCoinRewardInviteSucceedMsg(Long uid, int num, int banlce, boolean directFans) {
+ saveMsgDetail(MsgOtherDetailFactory.goldCoinRewardInviteSucceedMsg(uid, num, banlce, directFans));
}
-
+
@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));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void goldCoinOrderSubsidyMsg(Long uid, int num, int banlce, boolean directFans) {
+ saveMsgDetail(MsgOtherDetailFactory.goldCoinOrderSubsidyMsg(uid, num, banlce, directFans));
}
-
+
@Override
- public void freeSheetCouponUsing(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsing(coupon.getSource(),
- coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponMianDan, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ @Transactional(rollbackFor = Exception.class)
+ public void goldCoinExChangeMsg(Long uid, int num, int banlce, String name, String exNum) {
+ saveMsgDetail(MsgOtherDetailFactory.goldCoinExChangeMsg(uid, num, banlce, name, exNum));
}
-
- @Override
- public void freeSheetCouponUsed(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsed(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 freeSheetCouponWillOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponWillOutOfDate(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 freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponAlreadyOutOfDate(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 rewardCouponGet(UserSystemCoupon coupon) {
- 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(), 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));
- } 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(), dto,
- MsgTypeOtherTypeEnum.couponReward, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void rewardCouponWillOutOfDate(UserSystemCoupon coupon) {
- 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(), dto,
- MsgTypeOtherTypeEnum.couponReward, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void rewardCouponAlreadyOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), dto,
- MsgTypeOtherTypeEnum.couponReward, null));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
+
}
--
Gitblit v1.8.0