From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java
index 377a874..2164908 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java
@@ -61,7 +61,8 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void addOrUpdate(InviteOrderSubsidy subsidy, BigDecimal money, Long uid,int level) throws OrderTeamRewardException {
+ public void addOrUpdate(InviteOrderSubsidy subsidy, BigDecimal money, Long uid, int level)
+ throws OrderTeamRewardException {
if (subsidy == null || subsidy.getId() == null)
throw new OrderTeamRewardException(1, "琛ヨ创涓虹┖");
if (money == null)
@@ -141,6 +142,7 @@
OrderTeamReward orderSubsidy = new OrderTeamReward(id);
orderSubsidy.setMoney(money);
orderSubsidy.setState(OrderTeamReward.STATE_RECIEVED);
+ orderSubsidy.setGetTime(new Date());
orderSubsidy.setUpdateTime(new Date());
orderTeamRewardMapper.updateByPrimaryKeySelective(orderSubsidy);
}
@@ -153,12 +155,22 @@
@Override
public List<OrderTeamReward> listCanSettle(Long uid, int page, int pageSize) {
-
- return orderTeamRewardMapper.listCanSettleByUid(uid, (page-1)*pageSize, pageSize);
+
+ return orderTeamRewardMapper.listCanSettleByUid(uid, (page - 1) * pageSize, pageSize);
}
@Override
public long countCanSettle(Long uid) {
return orderTeamRewardMapper.countCanSettle(uid);
}
+
+ @Override
+ public List<Long> listCanSettleUid(Date time, int page, int count) {
+ return orderTeamRewardMapper.listCanSettleUid(time, (page - 1) * count, count);
+ }
+
+ @Override
+ public long countCanSettleUid(Date time) {
+ return orderTeamRewardMapper.countCanSettleUid(time);
+ }
}
--
Gitblit v1.8.0