From 0f52108bac0ebf47a563c41bcb97d934b7cf12ab Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 11 十二月 2019 15:07:06 +0800
Subject: [PATCH] 订单筛选
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 fff6d9e..012c740 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
@@ -300,12 +300,13 @@
// 鐗堟湰鍖哄垎锛�2.1 濂栧姳鍒稿�掕鏃�
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
Date thirdCreateTime = order.getThirdCreateTime();
- if (thirdCreateTime != null) {
+ Date accountTime = order.getAccountTime();
+ if (thirdCreateTime != null && accountTime != null) {
long downOrderTime = thirdCreateTime.getTime();
long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
if (downOrderTime > limitDate) {
newEdition = true;
- Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
+ Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
long currentTime = java.lang.System.currentTimeMillis();
if (endDay.getTime() > currentTime) {
DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
--
Gitblit v1.8.0