From 53672fd62a2084c8b3f8e7ce69e617ff9be58276 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 09:53:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/money/TeamEincomeManager.java | 9 ++++++---
1 files changed, 6 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 caf0b4a..9c0c7c6 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
@@ -13,10 +13,12 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.exception.ParamsException;
import com.yeshi.fanli.exception.money.TeamEincomeRecordException;
+import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.factory.money.TeamEincomeRecordFactory;
/**
@@ -90,6 +92,7 @@
}
/**
+ * @throws UserMoneyDetailException
* 鍒拌处鍒扮敤鎴蜂綑棰�
* @Title: addTOUserAccount
* @Description:
@@ -99,7 +102,7 @@
* @throws
*/
@Transactional(rollbackFor = Exception.class)
- public void addTOUserAccount(Date preSendTime, Long uid) {
+ public void addTOUserAccount(Date preSendTime, Long uid) throws UserMoneyDetailException {
Date now = new Date();
List<TeamEincomeRecord> list = teamEincomeRecordService.listCanRecieveRecord(preSendTime, uid);
BigDecimal money = new BigDecimal(0);
@@ -109,8 +112,8 @@
teamEincomeRecordService.setRecieved(record.getId());
}
- // TODO 鍒拌处
- UserMoneyDetail detail = null;
+ UserMoneyDetail detail = UserMoneyDetailFactory.createTeamReward(uid, money, preSendTime);
+
userMoneyService.addUserMoney(uid, money, detail);
// 鍙戦�佹秷鎭�
BigDecimal balance = userMoneyService.getBalance(uid);
--
Gitblit v1.8.0