From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 14 十月 2019 17:44:13 +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/order/msg/UserOrderMsgNotificationService.java | 61 ++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java index 98f8be8..bde8587 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java @@ -21,8 +21,8 @@ * @param orderState */ - public void orderFanLiStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, - int orderState); + public void orderFanLiStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int goodsCount, int orderState); /** * 杩斿埄璁㈠崟鐘舵�佹敼鍙� @@ -33,7 +33,8 @@ * @param money * @param orderState */ - public void orderFanLiStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int orderState); + public void orderFanLiStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int orderState); /** * 鍒嗕韩璁㈠崟缁熻 @@ -45,8 +46,8 @@ * @param goodsCount * @param orderState */ - public void orderShareStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, - int orderState); + public void orderShareStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int goodsCount, int orderState); /** * 鍒嗕韩璁㈠崟鐘舵�佹敼鍙� @@ -57,7 +58,8 @@ * @param money * @param orderState */ - public void orderShareStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int orderState); + public void orderShareStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int orderState); /** * 閭�璇疯鍗曠粺璁� @@ -69,8 +71,8 @@ * @param goodsCount * @param orderState */ - public void orderInviteStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount, - int orderState); + public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int goodsCount, int orderState); /** * 閭�璇疯鍗曠姸鎬佹敼鍙� @@ -81,11 +83,11 @@ * @param money * @param orderState */ - public void orderInviteStateChanged(Long uid, String orderId,int orderType, 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,int orderType, BigDecimal payMoney, BigDecimal money, - int goodsCount, int orderState, String sourceUserName); + public void orderShareFirstLevelStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, + BigDecimal money, int goodsCount, int orderState, String sourceUserName); /** * 鍒嗕韩璁㈠崟鐘舵�佹敼鍙� @@ -96,8 +98,8 @@ * @param money * @param orderState */ - public void orderShareFirstLevelStateChanged(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, - int orderState); + public void orderShareFirstLevelStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, + BigDecimal money, int orderState); /** * 璁㈠崟鎵惧洖鎴愬姛 @@ -108,7 +110,7 @@ * @param money * @param orderType */ - public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType,Date happendDate); + public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate); /** * 璁㈠崟鎵惧洖澶辫触 @@ -117,8 +119,35 @@ * @param orderId * @param payMoney * @param goodsCount - * @param orderType 1-娣樺疂 + * @param orderType + * 1-娣樺疂 */ - public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType,Date happendDate); + public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate); + + /** + * 楗夸簡涔堣鍗曠粺璁� + * + * @param uid + * @param orderId + * @param orderType + * @param payMoney + * @param money + * @param orderState + */ + public void orderElmeStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int orderState); + + /** + * 楗夸簡涔堣鍗曠姸鎬佹敼鍙� + * + * @param uid + * @param orderId + * @param orderType + * @param payMoney + * @param money + * @param orderState + */ + public void orderElmeStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money, + int orderState); } -- Gitblit v1.8.0