From 393e3a365b5ebbed6e9eef07fbd18881cde73711 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:51:04 +0800
Subject: [PATCH] Merge branch 'div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
index dbbece5..b80b4ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
@@ -344,6 +344,7 @@
 					InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
 					update.setState(InviteOrderSubsidy.STATE_INVALID);
 					update.setUpdateTime(new Date());
+					update.setInValidTime(new Date());
 					inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
 					orderTeamRewardService.invalidByOrderIdAndSourceType(subsidy.getId());
 				}
@@ -375,6 +376,7 @@
 					InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
 					update.setState(InviteOrderSubsidy.STATE_VALID);
 					update.setUpdateTime(new Date());
+					update.setValidTime(new Date());
 					update.setPreGetTime(preGetTime);
 					inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
 					orderTeamRewardService.validByOrderIdAndSourceType(subsidy.getId(), preGetTime);
@@ -391,4 +393,18 @@
 		inviteOrderSubsidyMapper.updateByPrimaryKeySelective(orderSubsidy);
 	}
 
+	
+	@Override
+	public BigDecimal sumRecievedMoneyByUid(long uid,  Integer level) {
+		return inviteOrderSubsidyMapper.sumRecievedMoneyByUid(uid, level);
+	}
+	
+	@Override
+	public BigDecimal sumValidMoneyByUidAndDate(long uid, Integer day, Integer level) {
+		return inviteOrderSubsidyMapper.sumValidMoneyByUidAndDate(uid, day, level);
+	}
+	
+	
+	
+	
 }

--
Gitblit v1.8.0