From 87aa923f96beedce8633fc36a0bc349cfd658c2e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 25 十月 2019 18:11:49 +0800
Subject: [PATCH] 大淘客叮咚呛数据修复 用户资金问号链接修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 88 insertions(+), 5 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 70b1c8b..f5e3a1f 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
@@ -8,9 +8,12 @@
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.MsgOtherSystemGiveDTO;
import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
@@ -148,7 +151,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();
}
@@ -235,7 +238,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();
}
@@ -250,7 +253,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();
}
@@ -264,7 +267,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();
}
@@ -278,7 +281,7 @@
.createRewardCouponAlreadyOutOfDate(coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());
try {
MsgOtherDetail detail = MsgOtherDetailFactory.createCouponMsg(coupon.getUid(), coupon.getId(), dto,
- MsgTypeOtherTypeEnum.couponReward, "鍙備笌娲诲姩鍙幏鍙栨洿澶氬鍔卞埜");
+ MsgTypeOtherTypeEnum.couponReward, "瀹屾垚閲戝竵浠诲姟锛屽厬鎹㈡洿澶氬鍔卞埜");
detail.setCreateTime(coupon.getEndTime());
msgOtherDetailService.addMsgOtherDetail(detail);
} catch (MsgOtherDetailException e) {
@@ -286,6 +289,35 @@
}
}
+
+
+ @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) {
@@ -317,6 +349,24 @@
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) {
@@ -352,6 +402,7 @@
}
+
@Override
public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO content) {
try {
@@ -367,4 +418,36 @@
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();
+ }
+ }
+
+ @Override
+ public void systemGiveRewardCoupon(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto) {
+ 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(dto));
+ detail.setType(MsgTypeOtherTypeEnum.systemGive);
+ msgOtherDetailService.addMsgOtherDetail(detail);
+ } catch (MsgOtherDetailException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0