From b907ba5b12a98e31d56c8847769875906a682b98 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 16:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 9c0c7c6..a8f52cc 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.manger.money;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -93,7 +94,7 @@
/**
* @throws UserMoneyDetailException
- * 鍒拌处鍒扮敤鎴蜂綑棰�
+ * 鍥㈤槦鏀剁泭 鍒拌处鍒扮敤鎴蜂綑棰�
* @Title: addTOUserAccount
* @Description:
* @param day
@@ -102,9 +103,14 @@
* @throws
*/
@Transactional(rollbackFor = Exception.class)
- public void addTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {
+ public void addTeamIncomeTOUserAccount(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();
- List<TeamEincomeRecord> list = teamEincomeRecordService.listCanRecieveRecord(preSendTime, uid);
+ List<TeamEincomeRecord> list = teamEincomeRecordService.listCanRecieveRecord(preSendTime, uid, typeList);
BigDecimal money = new BigDecimal(0);
for (TeamEincomeRecord record : list) {
record = teamEincomeRecordService.selectByPrimaryKeyForUpdate(record.getId());
@@ -120,4 +126,25 @@
userMoneyMsgNotificationService.teamReceive(uid, money, balance, now);
}
+ @Transactional(rollbackFor = Exception.class)
+ public void addTeamDividentsTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(TeamEincomeRecord.TYPE_TEAM_DIVIDENTS);
+ Date now = new Date();
+ List<TeamEincomeRecord> list = teamEincomeRecordService.listCanRecieveRecord(preSendTime, uid, typeList);
+ BigDecimal money = new BigDecimal(0);
+ for (TeamEincomeRecord record : list) {
+ record = teamEincomeRecordService.selectByPrimaryKeyForUpdate(record.getId());
+ money = money.add(record.getMoney());
+ teamEincomeRecordService.setRecieved(record.getId());
+ }
+
+ UserMoneyDetail detail = UserMoneyDetailFactory.createTeamDividents(uid, money, preSendTime);
+
+ userMoneyService.addUserMoney(uid, money, detail);
+ // 鍙戦�佹秷鎭�
+ BigDecimal balance = userMoneyService.getBalance(uid);
+ userMoneyMsgNotificationService.teamReceive(uid, money, balance, now);
+ }
+
}
--
Gitblit v1.8.0