From c573834c796cc77057455ef0b3d8d0412f9792b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 二月 2019 14:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..117fde4 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
@@ -46,7 +46,7 @@
}
@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 {
@@ -70,7 +70,8 @@
}
@Override
- public void orderFanliStatisticed(Long uid, String orderId) {
+ public void orderFanliStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,
+ BigDecimal money) {
if (Constant.IS_TEST)
return;
try {
@@ -222,7 +223,7 @@
}
@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 {
@@ -235,7 +236,7 @@
}
@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 {
@@ -248,7 +249,8 @@
}
@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) + "******";
@@ -262,7 +264,8 @@
}
@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) + "******";
@@ -272,7 +275,6 @@
} catch (PushException e) {
e.printStackTrace();
}
-
}
}
--
Gitblit v1.8.0