From fed386fafac07d40fa3f3627b8fcef13e2d2ec4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 四月 2020 14:41:46 +0800
Subject: [PATCH] 分红修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 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 ba234fe..4f60cd6 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
@@ -90,7 +90,7 @@
@Override
public void alipayAccountValid(AlipayAccountValidNormalHistory history, String limitDay, boolean change) {
MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(),
- Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), limitDay, change);
+ Constant.alipayConfig.getAccountName(), new BigDecimal("0.1"), limitDay, change);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
@@ -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) {
@@ -164,10 +186,8 @@
}
@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);
+ public void shareOrderReceived(Long uid, int orderType, BigDecimal money,BigDecimal balance, Date receivedDate) {
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.shareOrderReceivedMsg(money, balance, orderType, uid, receivedDate);
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
@@ -258,7 +278,7 @@
@Override
public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
- MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate);
+ MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "鍥㈤槦鏀剁泭");
try {
msgMoneyDetailService.addMsgMoneyDetail(detail);
} catch (MsgMoneyDetailException e) {
@@ -266,5 +286,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