From c2e3dea0d75b7239b1ed66c9d9e1bbb177050858 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 13:57:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java
index d6b7abe..4d01fdb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java
@@ -94,7 +94,7 @@
/**
* @throws UserMoneyDetailException
- * 鍥㈤槦鏀剁泭 鍒拌处鍒扮敤鎴蜂綑棰�
+ * 鍥㈤槦濂栭噾 鍒拌处鍒扮敤鎴蜂綑棰�
* @Title: addTOUserAccount
* @Description:
* @param day
@@ -103,10 +103,8 @@
* @throws
*/
@Transactional(rollbackFor = Exception.class)
- public void addTeamIncomeTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {
-
+ public void addTeamRewardTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {
List<Integer> typeList = new ArrayList<>();
- typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);
typeList.add(TeamEincomeRecord.TYPE_TEAM_REWARD);
Date now = new Date();
@@ -123,13 +121,24 @@
userMoneyService.addUserMoney(uid, money, detail);
// 鍙戦�佹秷鎭�
BigDecimal balance = userMoneyService.getBalance(uid);
- userMoneyMsgNotificationService.teamReceive(uid, money, balance, now);
+ userMoneyMsgNotificationService.teamRewardReceive(uid, money, balance, now);
}
+ /**
+ * 鍥㈤槦鍒嗙孩鍒拌处
+ * @Title: addTeamDividentsTOUserAccount
+ * @Description:
+ * @param preSendTime
+ * @param uid
+ * @throws UserMoneyDetailException
+ * void 杩斿洖绫诲瀷
+ * @throws
+ */
@Transactional(rollbackFor = Exception.class)
public void addTeamDividentsTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {
List<Integer> typeList = new ArrayList<>();
typeList.add(TeamEincomeRecord.TYPE_TEAM_DIVIDENTS);
+ typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);
Date now = new Date();
List<TeamEincomeRecord> list = teamEincomeRecordService.listCanRecieveRecord(preSendTime, uid, typeList);
BigDecimal money = new BigDecimal(0);
--
Gitblit v1.8.0