From 74ee9c42c1d87f3724a21e92871bc8c95c8364c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 17:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 184 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 171 insertions(+), 13 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 d7d9bb2..fb53761 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,10 +5,16 @@
import javax.annotation.Resource;
-import org.omg.CORBA.PERSIST_STORE;
import org.springframework.stereotype.Service;
+import com.google.gson.Gson;
+import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO;
+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;
@@ -111,10 +117,12 @@
if (coupon == null || coupon.getUid() == null)
return;
MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createWelfareCouponAlreadyOutOfDate(coupon.getSource(),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();
}
@@ -142,7 +150,7 @@
coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鍙湪棣栭〉-鍏嶅崟鍟嗗搧-閫夋嫨鍟嗗搧-浣跨敤"));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "棣栭〉-鍏嶅崟-閫夋嫨鍟嗗搧-浣跨敤"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -195,10 +203,13 @@
if (coupon == null || coupon.getUid() == null)
return;
MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
- .createWelfareCouponAlreadyOutOfDate(coupon.getSource(),coupon.getStartTime(), coupon.getEndTime());
+ .createWelfareCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
+ MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
+ MsgTypeOtherTypeEnum.couponMianDan, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜");
+ detail.setCreateTime(coupon.getEndTime());
+
+ msgOtherDetailService.addMsgOtherDetail(detail);
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -226,7 +237,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();
}
@@ -241,7 +252,7 @@
rewardMoney, orderId);
try {
msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜"));
+ coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "瀹屾垚閲戝竵浠诲姟锛屽厬鎹㈡洿澶氬鍔卞埜"));
} catch (MsgOtherDetailException e) {
e.printStackTrace();
}
@@ -255,7 +266,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();
}
@@ -268,11 +279,158 @@
MsgOtherCouponContentDTO dto = MsgOtherCouponContentDTOFactory
.createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
- msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),
- coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜"));
+ 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 couponUsingFreeSheet(UserSystemCoupon coupon, String orderId, BigDecimal money, MsgTypeOtherTypeEnum type) {
+ 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, type, "瀹炰粯娆�-杩斿埄=0鍏冭喘锛堝厤鍗曪級"));
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void couponUsedFreeSheet(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type) {
+ 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, type, "鍙備笌鍏朵粬娲诲姩鍙幏寰楁洿澶氬厤鍗曞埜"));
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @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 giveCouponActivateMsg(Long uid, String beiZhu, MsgOtherCouponActivateDTO 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.couponActivate);
+ 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();
+ }
+ }
+
+
+ @Override
+ public void tokenGiveMsg(Long uid, String beiZhu, MsgOtherGiveContentDTO 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.give);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+
+ @Override
+ public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO 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.exchange);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void firstOrderRewardMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO 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.firstOrderReward);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0