From 8cbb5ef78af910b4193e45fd6454d2dc862e0a8c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 17:08:08 +0800
Subject: [PATCH] 维权订单不显示奖励券入口
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 f8b0ccc..b4ee853 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
@@ -275,7 +275,15 @@
rewardOrder = true;
}
}
-
+
+
+ // 缁存潈璁㈠崟 涓嶅彲浣跨敤濂栧姳鍒�
+ Integer orderState = order.getState();
+ if(CommonOrder.STATE_WQ == orderState) {
+ rewardOrder = false;
+ }
+
+
if (rewardOrder) {
try {
boolean newEdition = false;
@@ -283,13 +291,12 @@
String unit = null;
boolean canUse = false;
- // 鐗堟湰鍖哄垎锛�2.1
+ // 鐗堟湰鍖哄垎锛�2.1 濂栧姳鍒稿�掕鏃�
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
long downOrderTime = thirdCreateTime.getTime();
- long limitDate = Long.parseLong("1571760000000"); // TODO
- // 鏃ユ湡寰呯‘瀹�2019-11-10
+ long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
if (downOrderTime > limitDate) {
newEdition = true;
Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
--
Gitblit v1.8.0