From 25f53110960c7d83476cc969ed88f3dce3e20b0c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 16 Jan 2019 17:27:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E8=B6=85=E6=97=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxPressOrderController.java | 2 +- .../src/main/java/com/iformall/utils/DateUtils.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java index 63ea44803..cc36fc38d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -70,7 +70,7 @@ public class WxPressOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } - if(order.getPressEndDate().after(curDate)) { + if(curDate.after(order.getPressEndDate())) { logger.error("砍价已超时:" + orderId); return new ResultData(ErrorCode.COUPON_PRESS_IS_OVERTIME); } diff --git a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java index d2f8a2e1d..ed234b278 100755 --- a/mallinkService/src/main/java/com/iformall/utils/DateUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/DateUtils.java @@ -379,10 +379,8 @@ public class DateUtils { * @return */ public static Date getHourTimeAfter(int hour, Date myDate) { - Date testDate = myDate; - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - long myTime = (testDate.getTime() / 1000) + 60 * 60 * hour; - testDate.setTime(myTime * 1000); + long myTime = (myDate.getTime() / 1000) + 60 * 60 * hour; + Date testDate = new Date(myTime * 1000); return testDate; }