From ee582a5d091966cf2324653c53a7553623e09730 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 19:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index e13ab17..d70907d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -649,7 +649,7 @@
 				Date thirdCreateTime = order.getThirdCreateTime();
 				if (thirdCreateTime != null) {
 					long downOrderTime = thirdCreateTime.getTime();
-					long limitDate = TimeUtil.convertDateToTemp("2019-09-05");
+					long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
 					if (downOrderTime > limitDate)
 						hasRewardCoupon = true;
 				}

--
Gitblit v1.8.0