From f4d4486e55b91ab2d6313c48dbe8500c3928e8fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamDividentsManager.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 1ef7474..89ae376 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
@@ -84,13 +84,14 @@
level = UserLevelEnum.daRen;
BigDecimal rate = getSourceOrderDividentsRate(level);
TeamDividentsSourceOrder order = TeamDividentsSourceOrderFactory.create(commonOrderList, rate);
+ if (order == null)
+ return;
try {
teamDividentsSourceOrderService.addTeamDividentsSourceOrder(order);
- } catch (TeamDividentsSourceOrderException e) {
- e.printStackTrace();
} catch (ParamsException e) {
- e.printStackTrace();
+ throw new TeamDividentsSourceOrderException(101, "鍙傛暟涓嶅畬鏁�");
}
+
}
/**
@@ -189,6 +190,11 @@
}
}
+ // 娌℃湁鍙備笌鍒嗙孩鐨勭敤鎴�
+ if (uidLevel == null || uidLevel.size() == 0) {
+ return;
+ }
+
BigDecimal perDivident = computePerDivident(uidLevel, totalMoney);
for (Iterator<Long> its = uidLevel.keySet().iterator(); its.hasNext();) {
Long uid = its.next();
@@ -256,9 +262,9 @@
* @throws
*/
@Transactional(rollbackFor = Exception.class)
- public void addToTeamEincome(Long uid, String day) throws TeamDividentsRecordException, TeamDividentsDebtException,
- UserMoneyDetailException, ParamsException, TeamEincomeRecordException {
- Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
+ public void addToTeamEincome(Long uid, Date preSendTime) throws TeamDividentsRecordException,
+ TeamDividentsDebtException, UserMoneyDetailException, ParamsException, TeamEincomeRecordException {
+ String day = TimeUtil.getGernalTime(preSendTime.getTime(), "yyyy-MM-dd");
BigDecimal money = teamDividentsSourceUserService.sumMoneyByUidAndDay(uid, day);
// 鏌ヨ闇�瑕佹墸闄ょ殑璧勯噾
List<TeamDividentsDebt> list = teamDividentsDebtService.listNeedRepayDebt(uid, preSendTime, 1, 1000);
@@ -339,7 +345,6 @@
} else if (sourceOrder.getState() == TeamDividentsSourceOrder.STATE_CAN_SEND) {
teamDividentsSourceOrderService.invalidOrder(orderNo, sourceType, "璁㈠崟缁存潈");
}
-
}
/**
--
Gitblit v1.8.0