From 81f4d5a0074dcc0da71ef453e4e02a4d1d7decf5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 11:53:33 +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 79c0770..466e8d9 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
@@ -645,9 +645,9 @@
// 1.6.5 鏄惁瀛樺湪鏂板厬鎹㈢殑鍒�
if (!hasRewardCoupon && exchangeCoupon) {
try {
- String downTime = order.getDownTime();
- if (!StringUtil.isNullOrEmpty(downTime)) {
- long downOrderTime = TimeUtil.convertDateToTemp2(downTime);
+ Date thirdCreateTime = order.getThirdCreateTime();
+ if (thirdCreateTime != null) {
+ long downOrderTime = thirdCreateTime.getTime();
long limitDate = TimeUtil.convertDateToTemp("2019-09-05");
if (downOrderTime > limitDate)
hasRewardCoupon = true;
--
Gitblit v1.8.0