From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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..5772b95 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) {
@@ -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) {
--
Gitblit v1.8.0