From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java
index 9a0749b..4cd6c9b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java
@@ -58,7 +58,7 @@
 	@Override
 	public void alipayAccountValid(AlipayAccountValidNormalHistory history) {
 		MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(),
-				"閲嶅簡妞拌缃戠粶鏈夐檺鍏徃", new BigDecimal("0.1"), null);
+				"閲嶅簡灏忓奖璁扮鎶�鏈夐檺鍏徃", new BigDecimal("0.1"), null);
 		try {
 			msgMoneyDetailService.addMsgMoneyDetail(detail);
 		} catch (MsgMoneyDetailException e) {
@@ -131,4 +131,24 @@
 
 	}
 
+	@Override
+	public void orderReward(Long uid, String orderId, BigDecimal money, BigDecimal balance) {
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderRewardMsg(uid, orderId, money, balance, null);
+		try {
+			msgMoneyDetailService.addMsgMoneyDetail(detail);
+		} catch (MsgMoneyDetailException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance) {
+		MsgMoneyDetail detail = MsgMoneyDetailFactory.createSystemEqualizeMsg(uid, reason, money, balance, null);
+		try {
+			msgMoneyDetailService.addMsgMoneyDetail(detail);
+		} catch (MsgMoneyDetailException e) {
+			e.printStackTrace();
+		}
+	}
+
 }

--
Gitblit v1.8.0