From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 04 十一月 2019 09:55:55 +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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 52 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 4f47a4f..cdc3eee 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 @@ -1,9 +1,12 @@ package com.yeshi.fanli.service.inter.money.msg; import java.math.BigDecimal; +import java.util.Date; +import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum; import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory; import com.yeshi.fanli.entity.bus.user.Extract; +import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord; /** * 鐢ㄦ埛璧勯噾娑堟伅閫氱煡 @@ -51,7 +54,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); /** * 杩斿埄璁㈠崟缁存潈 @@ -61,7 +65,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); /** * 鍒嗕韩璧氳鍗曡缁熻 @@ -72,7 +76,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); /** * 鍒嗕韩璁㈠崟缁存潈 @@ -83,7 +88,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); /** * 閭�璇疯禋璁㈠崟琚粺璁� @@ -94,7 +99,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); /** * 閭�璇疯鍗曠淮鏉� @@ -104,7 +110,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); /** * 濂栧姳璁㈠崟鍒拌处 @@ -114,7 +120,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); /** * 绯荤粺琛ラ綈 @@ -126,4 +132,43 @@ */ 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); + + /** + * 绾㈠寘娑堟伅 + */ + public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu); + + /** + * 琛ヨ创娑堟伅 + * + * @param uid + * @param date + * @param from + * @param money + * @param balance + */ + public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance); + } -- Gitblit v1.8.0