From ade84017d710125aeaa256bfea674640b16747db Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 17:46:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 295 ++++++++--------------------------------------------------
1 files changed, 41 insertions(+), 254 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 459bb5d..be216b3 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,22 +1,16 @@
package com.yeshi.fanli.service.impl.msg;
-import java.math.BigDecimal;
import java.util.Date;
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;
-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;
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
@@ -24,276 +18,69 @@
@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(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void welfareCouponActive(UserSystemCoupon coupon, UserInfo worker) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponActive(getLeftDay(coupon),
- "鎴愬姛閭�璇烽槦鍛�:" + worker.getNickName(), coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙湪棣栭〉-鍏嶅崟鍟嗗搧-閫夋嫨鍟嗗搧-浣跨敤"));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- 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());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級"));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void welfareCouponUsed(UserSystemCoupon coupon, String orderId) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(orderId,
- "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級", coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @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(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponWelfareMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .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, "閫�鍥炲悗渚濈劧鍙湪鏈夋晥鏈熷唴浣跨敤"));
- } 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 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(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鍙湪棣栭〉-鍏嶅崟鍟嗗搧-閫夋嫨鍟嗗搧-浣跨敤"));
- } 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 freeSheetCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createCouponUsing(orderId, money,
- coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級"));
- } 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 freeSheetCouponUsed(UserSystemCoupon coupon, String orderId) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createWelfareCouponUsed(orderId,
- "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級", coupon.getStartTime(), coupon.getEndTime());
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
- } 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 freeSheetCouponWillOutOfDate(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(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鑷冲皯鎴愬姛閭�璇�1涓槦鍛樺悗鍙縺娲�"));
- } 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 freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createWelfareCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
- try {
- MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
- MsgTypeOtherTypeEnum.couponMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜");
- detail.setCreateTime(coupon.getEndTime());
-
- msgOtherDetailService.addMsgOtherDetail(detail);
- } 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 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();
- }
+ @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 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, "杩斿埄宸插埌璐﹀悗鍐嶅鍔辫繑鍒╃殑" + percent + "%"));
- } 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 rewardCouponUsed(UserSystemCoupon coupon, BigDecimal oldFanLiMoney, BigDecimal rewardMoney,
- String orderId) {
- if (coupon == null || coupon.getUid() == null)
- return;
- MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory.createRewardCouponUsed(oldFanLiMoney,
- rewardMoney, orderId);
- try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜"));
- } catch (MsgOtherDetailException e) {
- e.printStackTrace();
- }
+ public void cloudMsg(Long uid, String category, String item, String desc) {
+ saveMsgDetail(MsgOtherDetailFactory.cloudMsg(uid, category, item, desc));
}
-
- @Override
- 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, "杩斿埄宸插埌璐﹀悗鍐嶅鍔辫繑鍒╃殑" + percent + "%"));
- } 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 {
- 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 taoLiJinGet(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, "杩斿埄宸插埌璐﹀悗鍐嶅鍔辫繑鍒╃殑" + percent + "%"));
-// } catch (MsgOtherDetailException e) {
-// e.printStackTrace();
-// }
-// }
-
+
}
--
Gitblit v1.8.0