From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java | 162 ++++++++++++++++++++++++++++------------------------- 1 files changed, 86 insertions(+), 76 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 588df1d..516ef35 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 @@ -3,9 +3,9 @@ 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; /** * 鐢ㄦ埛璧勯噾娑堟伅閫氱煡 @@ -30,20 +30,37 @@ */ public void extractFail(Extract extract, String stateDesc); + /** - * 鎻愮幇鎴愬姛 - * + * 鎻愮幇鎴愬姛 + * @Title: extractSuccess + * @Description: * @param extract + * @param alipayNo 鏀粯瀹濇祦姘村彿 + * void 杩斿洖绫诲瀷 + * @throws */ - public void extractSuccess(Extract extract); + public void extractSuccess(Extract extract, String alipayNo); /** * 鏀粯瀹濊处鍙烽獙璇� * * @param history + * @param limitDay 闄愬埗鏃堕棿 + * @param change 鏄惁涓轰慨鏀� true 淇敼 false 棣栨缁戝畾 */ - public void alipayAccountValid(AlipayAccountValidNormalHistory history); + public void alipayAccountValid(AlipayAccountValidNormalHistory history, String limitDay, boolean change); + /** + * 浠樺疂璐﹀彿楠岃瘉澶辫触 + * @param history + * @param limitDay + * @param change + */ + public void alipayAccountValidFail(AlipayAccountValidNormalHistory history, int limitDay, boolean change); + + + /** * 杩斿埄璁㈠崟鍒拌处 * @@ -54,72 +71,54 @@ * @param balance */ public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money, - BigDecimal balance); + BigDecimal balance, Date downTime); /** * 杩斿埄璁㈠崟缁存潈 - * - * @param uid - * @param orderId - * @param money - * @param balance + * @Title: fanliOrderWeiQuan + * @Description: + * @param uid 鐢ㄦ埛ID + * @param orderId -璁㈠崟鍙� + * @param orderType -璁㈠崟绫诲瀷 + * @param money -缁存潈鎵ｉ櫎閲戦 + * @param fanliMoney -杩斿埄閲戦 + * @param goodsCount 鍟嗗搧鏁伴噺 + * @param downTime 涓嬪崟鏃堕棿 + * void 杩斿洖绫诲瀷 + * @throws */ - 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 fanliMoney, int goodsCount, Date downTime); /** - * 鍒嗕韩璧氳鍗曡缁熻 - * + * 鍒嗕韩璧氳鍗曞埌璐� * @param uid - * @param orderCount - * @param goodsCount - * @param money - * @param balance + * @param orderType 1-娣樺疂 2-浜笢绛夋笭閬� + * @param money 鍒拌处閲戦 + * @param balance 璐︽埛浣欓 + * @param receivedDate 缁撶畻鏈堜唤 */ - public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money, - BigDecimal balance); + public void shareOrderReceived(Long uid, int orderType, BigDecimal money, BigDecimal balance, Date receivedDate); + + /** * 鍒嗕韩璁㈠崟缁存潈 - * + * @Title: shareOrderWeiQuan + * @Description: * @param uid - * @param orderId - * @param money - * @param balance + * @param orderId -璁㈠崟鍙� + * @param orderType 璁㈠崟绫诲瀷 + * @param money 缁存潈閲戦 + * @param fanliMoney 杩斿埄閲戦 + * @param goodsCount -鍟嗗搧鏁伴噺 + * @param downTime 涓嬪崟鏃堕棿 + * void 杩斿洖绫诲瀷 + * @throws */ - 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 fanliMoney, int goodsCount, Date downTime); - /** - * 閭�璇疯禋璁㈠崟琚粺璁� - * - * @param uid - * @param orderCount - * @param goodsCount - * @param money - * @param balance - */ - public void inviteOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money, - BigDecimal balance); - /** - * 閭�璇疯鍗曠淮鏉� - * - * @param uid - * @param orderId - * @param money - * @param balance - */ - public void inviteOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance); - - /** - * 濂栧姳璁㈠崟鍒拌处 - * - * @param uid - * @param orderId - * @param money - * @param balance - */ - public void orderReward(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance); /** * 绯荤粺琛ラ綈 @@ -131,38 +130,49 @@ */ public void systemEqualize(Long uid, String reason, 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); + + + /** + * 鍥㈤槦鏀剁泭娑堟伅 + * @param uid + * @param money 鏈鍒拌处閲戦 + * @param balance 浣欓 + * @param receivedDate 缁撶畻鏈堝害 + */ + public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate); + + /** + * 浣跨敤濂栧姳鍒� * @param uid * @param orderId + * @param orderType + * @param goodsCount * @param money * @param balance + * @param downTime */ - public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance); + public void rewardCounponReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money, + BigDecimal balance, Date downTime); /** - * 鑷姩鎻愮幇娑堟伅-寰俊 - * - * @param extractRecord - * - * @param stateDesc - * - * @param desc - * - * @param beiZhu - */ - public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu); - - /** - * 琛ヨ创娑堟伅 - * + * 鍥㈤槦鍒嗙孩 * @param uid - * @param date - * @param from * @param money * @param balance + * @param receivedDate */ - public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance); + public void teamDividend(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate); + + } -- Gitblit v1.8.0