From 7b3994d42861437494156d7d7b4e987068f3682c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:09:10 +0800
Subject: [PATCH] vip 自动升级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
index 90d8440..0decc79 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java
@@ -123,8 +123,30 @@
 	@Override
 	public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
 			BigDecimal balance, Date downTime) {
-		MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
-				uid, Constant.TYPE_REBATE, downTime, false);
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
+				uid, downTime, false);
+		try {
+			msgMoneyDetailService.addMsgMoneyDetail(detail);
+		} catch (MsgMoneyDetailException e) {
+			e.printStackTrace();
+		}
+
+		PushContentDTO dto = PushMsgFactory.createMoneyFanliRecieved(orderType, orderId, money);
+		try {
+			pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
+		} catch (NumberFormatException e) {
+			e.printStackTrace();
+		} catch (PushException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	
+	@Override
+	public void rewardCounponReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money,
+			BigDecimal balance, Date downTime) {
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
+				uid, downTime, true);
 		try {
 			msgMoneyDetailService.addMsgMoneyDetail(detail);
 		} catch (MsgMoneyDetailException e) {
@@ -166,8 +188,7 @@
 	@Override
 	public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money,
 			BigDecimal balance, String orderId, Date downTime) {
-		MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderReceivedMsg(money, balance, orderId, orderType, goodsCount,
-				uid, Constant.TYPE_SHAER, downTime, false);
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.shareOrderReceivedMsg(money, balance, orderType, uid);
 		try {
 			msgMoneyDetailService.addMsgMoneyDetail(detail);
 		} catch (MsgMoneyDetailException e) {
@@ -257,8 +278,20 @@
 
 
 	@Override
-	public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
-		MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate);
+	public void teamReceive(Long uid, BigDecimal money, BigDecimal subsidy, BigDecimal balance, Date receivedDate) {
+		BigDecimal totalMoney = new BigDecimal(0);
+		if (money != null) {
+			totalMoney = totalMoney.add(money);
+		} 
+		if (subsidy != null) {
+			totalMoney = totalMoney.add(subsidy);	
+		}
+		
+		if (totalMoney.compareTo(new BigDecimal(0)) <= 0) {
+			return;
+		}
+		
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, totalMoney, balance, receivedDate, "鍥㈤槦鏀剁泭");
 		try {
 			msgMoneyDetailService.addMsgMoneyDetail(detail);
 		} catch (MsgMoneyDetailException e) {
@@ -266,5 +299,15 @@
 		}
 	}
 
+	
+	@Override
+	public void teamDividend(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "鍥㈤槦鍒嗙孩");
+		try {
+			msgMoneyDetailService.addMsgMoneyDetail(detail);
+		} catch (MsgMoneyDetailException e) {
+			e.printStackTrace();
+		}
+	}
 
 }

--
Gitblit v1.8.0