From dcfd801ea435c1c87ed47f2ee24cdabaaf230d6f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 31 三月 2020 12:15:56 +0800
Subject: [PATCH] 大淘客商品过滤修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..b7fb16f 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)
@@ -114,7 +115,7 @@
OrderTeamReward update = new OrderTeamReward(subsidy.getId());
update.setState(OrderTeamReward.STATE_INVALID);
update.setUpdateTime(new Date());
-
+ update.setInValidTime(new Date());
orderTeamRewardMapper.updateByPrimaryKeySelective(update);
}
}
@@ -131,6 +132,7 @@
update.setState(OrderTeamReward.STATE_VALID);
update.setUpdateTime(new Date());
update.setPreGetTime(preGetTime);
+ update.setValidTime(new Date());
orderTeamRewardMapper.updateByPrimaryKeySelective(update);
}
}
@@ -141,6 +143,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 +156,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