From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/dividents/TeamDividentsSourceOrderUserMapServiceImpl.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 52 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..dd34832 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
@@ -7,6 +7,7 @@
 
 import javax.annotation.Resource;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,6 +16,8 @@
 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;
+import com.yeshi.fanli.vo.order.TeamOrderVO;
 
 @Service
 public class TeamDividentsSourceOrderUserMapServiceImpl implements TeamDividentsSourceOrderUserMapService {
@@ -37,6 +40,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 +122,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 +140,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 +158,48 @@
 				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);
+	}
+	
+	
+	@Override
+	public List<TeamOrderVO> searchByOrderNoOrSourceUid(long start, int count, Long targetUid ,String key) {
+		return teamDividentsSourceOrderUserMapMapper.searchByOrderNoOrSourceUid(start, count, targetUid, key);
+	}
+	
+	@Override
+	public long countSearchByOrderNoOrSourceUid(Long targetUid ,String key) {
+		Long count = teamDividentsSourceOrderUserMapMapper.countSearchByOrderNoOrSourceUid(targetUid, key);
+		if (count == null) 
+			count = 0L;
+		return count;
+	}
 }

--
Gitblit v1.8.0