From 83bb6e0580b646c5d89da1cdb4085787c8136822 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 14:29:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java
index f06dcf4..3d4f22f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java
@@ -37,6 +37,7 @@
TeamDividentsSourceOrderUserMap update = new TeamDividentsSourceOrderUserMap();
update.setId(id);
update.setState(TeamDividentsSourceOrderUserMap.STATE_YILINGQU);
+ update.setSendTime(new Date());
update.setUpdateTime(new Date());
teamDividentsSourceOrderUserMapMapper.updateByPrimaryKeySelective(update);
}
@@ -118,6 +119,14 @@
}
}
+ @Override
+ public void invalidOrderBySourceUid(Long sourceUid, String beiZhu) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(TeamDividentsSourceOrderUserMap.STATE_FK);
+ stateList.add(TeamDividentsSourceOrderUserMap.STATE_JS);
+ teamDividentsSourceOrderUserMapMapper.invalidOrderBySourceUid(sourceUid, beiZhu, stateList);
+ }
+
@Transactional
@Override
public void orderSettle(Long sourceOrderId, Date preSendTime, BigDecimal income) {
@@ -128,9 +137,10 @@
TeamDividentsSourceOrderUserMap update = new TeamDividentsSourceOrderUserMap();
update.setId(map.getId());
- update.setMoney(MoneyBigDecimalUtil.div(income.multiply(map.getRate()), new BigDecimal(100), 4));
+ update.setMoney(MoneyBigDecimalUtil.div(income.multiply(map.getRate()), new BigDecimal(100), 3));
update.setUpdateTime(new Date());
update.setState(TeamDividentsSourceOrderUserMap.STATE_JS);
+ update.setPreSendTime(preSendTime);
teamDividentsSourceOrderUserMapMapper.updateByPrimaryKeySelective(update);
}
}
@@ -145,7 +155,7 @@
if (map.getState() == TeamDividentsSourceOrderUserMap.STATE_FK) {
TeamDividentsSourceOrderUserMap update = new TeamDividentsSourceOrderUserMap();
update.setId(map.getId());
- update.setMoney(MoneyBigDecimalUtil.div(income.multiply(map.getRate()), new BigDecimal(100), 4));
+ update.setMoney(MoneyBigDecimalUtil.div(income.multiply(map.getRate()), new BigDecimal(100), 3));
update.setUpdateTime(new Date());
teamDividentsSourceOrderUserMapMapper.updateByPrimaryKeySelective(update);
}
--
Gitblit v1.8.0