From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 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..c0dbb40 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
@@ -15,6 +15,7 @@
import com.yeshi.fanli.exception.ParamsException;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.vo.order.TeamDividentsVO;
@Service
public class TeamDividentsSourceOrderUserMapServiceImpl implements TeamDividentsSourceOrderUserMapService {
@@ -37,6 +38,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 +120,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 +138,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,11 +156,35 @@
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);
}
}
}
+
+ @Override
+ public List<TeamDividentsSourceOrderUserMap> listBySourceOrderIdAndTargetUid(Long sourceOrderId, Long targetUid) {
+ return teamDividentsSourceOrderUserMapMapper.list(sourceOrderId, null, targetUid, null, null, null, 0, 10000);
+ }
+
+ @Override
+ public List<TeamDividentsVO> listByDateAndTargetUid(long start, int count, Long targetUid,Date minTime,Date maxTime, String key) {
+ return teamDividentsSourceOrderUserMapMapper.listByDateAndTargetUid(start, count, targetUid, minTime, maxTime, key);
+ }
+
+ @Override
+ public long countByDateAndTargetUid(Long targetUid,Date minTime,Date maxTime, String key) {
+ Long count = teamDividentsSourceOrderUserMapMapper.countByDateAndTargetUid(targetUid, minTime, maxTime, key);
+ if (count == null)
+ count = 0L;
+ return count;
+ }
+
+ @Override
+ public TeamDividentsVO sumByDateAndTargetUid(Long targetUid,Date minTime,Date maxTime, String key) {
+ return teamDividentsSourceOrderUserMapMapper.sumByDateAndTargetUid(targetUid, minTime, maxTime, key);
+ }
+
}
--
Gitblit v1.8.0