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/user/UserSystemCouponServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 996f96f..ee28c64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -78,6 +78,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.TokenUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
@@ -861,13 +862,12 @@
if (orderVO == null)
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
- // 鐗堟湰鍖哄垎锛�2.0.2
+ // 鐗堟湰鍖哄垎锛�2.1
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
Date thirdCreateTime = orderVO.getThirdCreateTime();
if (thirdCreateTime != null) {
long downOrderTime = thirdCreateTime.getTime();
- long limitDate = Long.parseLong("1573315200000"); // TODO
- // 鏃ユ湡寰呯‘瀹�2019-11-10
+ long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
if (downOrderTime > limitDate) {
Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
long currentTime = java.lang.System.currentTimeMillis();
@@ -884,12 +884,12 @@
if (!valid && dateInfo.getMinute() > 0)
valid = true;
- if (!valid && dateInfo.getSecond() >= 0)
+ if (!valid && dateInfo.getSecond() > 0)
valid = true;
}
if (!valid)
- throw new UserSystemCouponException(1, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�");
+ throw new UserSystemCouponException(1, "璇ヨ鍗曞凡瓒呰繃鏈夋晥浣跨敤濂栧姳鍒告椂闂�");
}
}
}
--
Gitblit v1.8.0