From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 24 三月 2020 12:01:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 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 8690783..bd78bd6 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,7 +1,9 @@ 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; @@ -140,7 +142,7 @@ */ public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance); - /* + /** * 鑷姩鎻愮幇娑堟伅-寰俊 * * @param extractRecord @@ -153,4 +155,41 @@ */ public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, 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); + + /** + * 绾㈠寘娑堟伅 + */ + public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu); + + /** + * 绾㈠寘娑堟伅-闃熷弸濂栧姳 + */ + public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type, BigDecimal money, String stateDesc,String content); + + /** + * 鍥㈤槦濂栧姳娑堟伅 + * @Title: orderTeamReward + * @Description: + * @param uid + * @param date + * @param from + * @param money + * @param balance + * void 杩斿洖绫诲瀷 + * @throws + */ + public void orderTeamReward(Long uid, Date date, String from, BigDecimal money, BigDecimal balance); + + } -- Gitblit v1.8.0