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/money/msg/UserMoneyMsgNotificationService.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java index 18346e6..8690783 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java @@ -52,7 +52,8 @@ * @param money * @param balance */ - public void fanliOrderReceived(Long uid, String orderId,int orderType, int goodsCount, BigDecimal money, BigDecimal balance); + public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money, + BigDecimal balance); /** * 杩斿埄璁㈠崟缁存潈 @@ -62,7 +63,7 @@ * @param money * @param balance */ - public void fanliOrderWeiQuan(Long uid, String orderId,int orderType, BigDecimal money, BigDecimal balance); + public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance); /** * 鍒嗕韩璧氳鍗曡缁熻 @@ -73,7 +74,8 @@ * @param money * @param balance */ - public void shareOrderReceived(Long uid,int orderType, int orderCount, int goodsCount, BigDecimal money, BigDecimal balance); + public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money, + BigDecimal balance); /** * 鍒嗕韩璁㈠崟缁存潈 @@ -84,7 +86,7 @@ * @param balance */ - public void shareOrderWeiQuan(Long uid, String orderId,int orderType, BigDecimal money, BigDecimal balance); + public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance); /** * 閭�璇疯禋璁㈠崟琚粺璁� @@ -95,7 +97,8 @@ * @param money * @param balance */ - public void inviteOrderReceived(Long uid,int orderType, int orderCount, int goodsCount, BigDecimal money, BigDecimal balance); + public void inviteOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money, + BigDecimal balance); /** * 閭�璇疯鍗曠淮鏉� @@ -105,7 +108,7 @@ * @param money * @param balance */ - public void inviteOrderWeiQuan(Long uid, String orderId,int orderType, BigDecimal money, BigDecimal balance); + public void inviteOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance); /** * 濂栧姳璁㈠崟鍒拌处 @@ -115,7 +118,7 @@ * @param money * @param balance */ - public void orderReward(Long uid, String orderId,int orderType, BigDecimal money, BigDecimal balance); + public void orderReward(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance); /** * 绯荤粺琛ラ綈 @@ -128,10 +131,24 @@ public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance); /** + * 楗夸簡涔堣繑鍒╁埌璐� + * + * @param uid + * @param orderId + * @param money + * @param balance + */ + public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance); + + /* * 鑷姩鎻愮幇娑堟伅-寰俊 + * * @param extractRecord + * * @param stateDesc + * * @param desc + * * @param beiZhu */ public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu); -- Gitblit v1.8.0