From 84ab5704aee0df06d0352ab67d1fa671ac284c8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 18 十二月 2019 10:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 8f36aa0..a6075af 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
@@ -698,9 +698,9 @@
return;
// 涓嬪崟鏃ユ湡鏄惁鏄鍚堜笂绾挎棩鏈�
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
- if (downOrderTime > limitDate) {
+ long downOrderTime = thirdCreateTime.getTime();
+ long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+ if (downOrderTime > limitDate) {
// 2.1 寮�濮嬫柊鐗�
rewardCounponLimitTime(order, accountTime);
} else if (hasRewardCoupon) {
--
Gitblit v1.8.0