From 79896552fa31dea34403e64076431a0e2277e50f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 28 六月 2020 16:47:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
index d54468f..219531b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java
@@ -125,7 +125,7 @@
String key = its.next();
Long uid = Long.parseLong(key.split("#")[0]);
Integer type = Integer.parseInt(key.split("#")[1]);
- BigDecimal dividents = moneyMap.get(uid).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal dividents = moneyMap.get(key).setScale(2, BigDecimal.ROUND_DOWN);
// 灏嗚祫閲戝垎閰嶅埌鍙備笌鍒嗙孩鐨勭敤鎴�
TeamDividentsSourceUser teamDividentsSourceUser = new TeamDividentsSourceUser();
teamDividentsSourceUser.setDay(day);
@@ -198,7 +198,6 @@
@Transactional(rollbackFor = Exception.class)
public void addToTeamEincome(Long uid, Date preSendTime) throws TeamDividentsRecordException,
TeamDividentsDebtException, UserMoneyDetailException, ParamsException, TeamEincomeRecordException {
-
addToTeamEincome(uid, preSendTime, TeamDividentsSourceOrderUserMap.TYPE_MORE_THAN_2);
addToTeamEincome(uid, preSendTime, TeamDividentsSourceOrderUserMap.TYPE_TEAM_DIVIDENTS);
}
--
Gitblit v1.8.0