From 010760fd974453a70948fef465284d8c817314f5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 三月 2020 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div-1

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderTeamRewardServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 2164908..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
@@ -115,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);
 				}
 			}
@@ -132,6 +132,7 @@
 					update.setState(OrderTeamReward.STATE_VALID);
 					update.setUpdateTime(new Date());
 					update.setPreGetTime(preGetTime);
+					update.setValidTime(new Date());
 					orderTeamRewardMapper.updateByPrimaryKeySelective(update);
 				}
 			}

--
Gitblit v1.8.0