From 5674a2bb28b92a843b9bb43cff02c3e7967c1b84 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 01 四月 2019 14:31:52 +0800
Subject: [PATCH] 修改未加入营销商品库的商品返利为0

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 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..0958a36 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
@@ -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,20 @@
 			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();
 		}
 	}
 
 	@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 {
 			pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
-					Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId));
+					Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[璁㈠崟鍙穄", orderId), null, null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -88,7 +89,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 +131,7 @@
 			return;
 		try {
 			pushService.pushZNX(uid, Constant.znxConfig.getExtractApplayTitle(),
-					Constant.znxConfig.getExtractApplayMsg());
+					Constant.znxConfig.getExtractApplayMsg(), null, null);
 		} catch (PushException e) {
 			e.printStackTrace();
 		}
@@ -142,7 +143,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 +170,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 +198,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 +223,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 +236,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 +249,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 +264,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