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/user/UserNotificationServiceImpl.java | 51 ++++++++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
index 015db63..57c2d2e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java
@@ -6,7 +6,7 @@
import org.springframework.stereotype.Service;
-import com.yeshi.fanli.controller.client.UserInfoController;
+import com.yeshi.fanli.controller.client.v1.UserInfoController;
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -39,19 +39,19 @@
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getNewerHongbaoTitle(),
- Constant.znxConfig.getNewerHongbaoMsg().replace("[閲戦]", money.toString()));
+ Constant.znxConfig.getNewerHongbaoMsg().replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
}
@Override
- public void orderFanliRecieved(Long uid, String orderId, BigDecimal money) {
+ public void orderFanliRecieved(Long uid, String orderId, int goodsCount, BigDecimal balance, BigDecimal money) {
if (Constant.IS_TEST)
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getOrderFanliRecieveTitle(), Constant.znxConfig
- .getOrderFanliRecieveMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+ .getOrderFanliRecieveMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -63,19 +63,7 @@
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),
- Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()));
- } catch (PushException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void orderFanliStatisticed(Long uid, String orderId) {
- if (Constant.IS_TEST)
- return;
- try {
- pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
- Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId));
+ Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -88,7 +76,7 @@
orderId = orderId.substring(0, orderId.length() - 6) + "******";
try {
pushService.pushZNX(uid, Constant.znxConfig.getTichengOrderStatisticedTitle(), Constant.znxConfig
- .getTichengOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+ .getTichengOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -130,7 +118,7 @@
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getExtractApplayTitle(),
- Constant.znxConfig.getExtractApplayMsg());
+ Constant.znxConfig.getExtractApplayMsg(), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -142,7 +130,7 @@
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getExtractTransferFailTitle(),
- Constant.znxConfig.getExtractTransferFailMsg().replace("[鏃堕棿]", time));
+ Constant.znxConfig.getExtractTransferFailMsg().replace("[鏃堕棿]", time), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -169,7 +157,7 @@
try {
pushService.pushZNX(uid, Constant.znxConfig.getExtractWrongTitle(),
- Constant.znxConfig.getExtractWrongMsg().replace("[鏃堕棿]", time));
+ Constant.znxConfig.getExtractWrongMsg().replace("[鏃堕棿]", time), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -197,7 +185,7 @@
try {
pushService.pushZNX(uid, Constant.znxConfig.getExtractSuccessTitle(),
- Constant.znxConfig.getExtractSuccessMsg().replace("[鏃堕棿]", time));
+ Constant.znxConfig.getExtractSuccessMsg().replace("[鏃堕棿]", time), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -222,12 +210,12 @@
}
@Override
- public void tiChengInviteRecieved(Long uid, BigDecimal money) {
+ public void tiChengInviteRecieved(Long uid, int orderCount, int goodsCount, BigDecimal balance, BigDecimal money) {
if (Constant.IS_TEST)
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getInviteMoneyRecieveTitle(),
- Constant.znxConfig.getInviteMoneyRecieveMsg().replace("[閲戦]", money.toString()));
+ Constant.znxConfig.getInviteMoneyRecieveMsg().replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -235,12 +223,12 @@
}
@Override
- public void tiChengShareRecieved(Long uid, BigDecimal money) {
+ public void tiChengShareRecieved(Long uid, int orderCount, int goodsCount, BigDecimal balance, BigDecimal money) {
if (Constant.IS_TEST)
return;
try {
pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),
- Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()));
+ Constant.znxConfig.getShareMoneyRecieveMsg().replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -248,13 +236,14 @@
}
@Override
- public void orderShareStatisticed(Long uid, String orderId, BigDecimal money) {
+ public void orderShareStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,
+ BigDecimal money) {
if (Constant.IS_TEST)
return;
orderId = orderId.substring(0, orderId.length() - 6) + "******";
try {
pushService.pushZNX(uid, Constant.znxConfig.getShareOrderStatisticedTitle(), Constant.znxConfig
- .getShareOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+ .getShareOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
@@ -262,17 +251,17 @@
}
@Override
- public void orderInviteStatisticed(Long uid, String orderId, BigDecimal money) {
+ public void orderInviteStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,
+ BigDecimal money) {
if (Constant.IS_TEST)
return;
orderId = orderId.substring(0, orderId.length() - 6) + "******";
try {
pushService.pushZNX(uid, Constant.znxConfig.getInviteOrderStatisticedTitle(), Constant.znxConfig
- .getInviteOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()));
+ .getInviteOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId).replace("[閲戦]", money.toString()), null, null);
} catch (PushException e) {
e.printStackTrace();
}
-
}
}
--
Gitblit v1.8.0