From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 22 七月 2019 15:39:56 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOrderMsgNotificationService.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOrderMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOrderMsgNotificationService.java index 9bab3b0..01ee1ea 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOrderMsgNotificationService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOrderMsgNotificationService.java @@ -21,7 +21,7 @@ * @param orderState */ - public void orderFanLiStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount, + public void orderFanLiStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, int orderState); /** @@ -33,7 +33,7 @@ * @param money * @param orderState */ - public void orderFanLiStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int orderState); + public void orderFanLiStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int orderState); /** * 鍒嗕韩璁㈠崟缁熻 @@ -45,7 +45,7 @@ * @param goodsCount * @param orderState */ - public void orderShareStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount, + public void orderShareStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, int orderState); /** @@ -57,7 +57,7 @@ * @param money * @param orderState */ - public void orderShareStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int orderState); + public void orderShareStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int orderState); /** * 閭�璇疯鍗曠粺璁� @@ -69,7 +69,7 @@ * @param goodsCount * @param orderState */ - public void orderInviteStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount, + public void orderInviteStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, int orderState); /** @@ -81,10 +81,10 @@ * @param money * @param orderState */ - public void orderInviteStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, + public void orderInviteStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int orderState); - public void orderShareFirstLevelStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, + public void orderShareFirstLevelStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, int orderState, String sourceUserName); /** @@ -96,7 +96,7 @@ * @param money * @param orderState */ - public void orderShareFirstLevelStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, + public void orderShareFirstLevelStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int orderState); /** -- Gitblit v1.8.0