From bc2e0ab2b789a24ef52811ca02eef778e986c41e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 18 Jan 2019 10:51:19 +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=E5=88=B8=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E5=B0=8F?= =?UTF-8?q?=E7=9A=84=E8=B5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 1371d694d..5d139b0c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -378,7 +378,11 @@ public class WxOrderServiceImpl implements WxOrderService { if (isPress) { // 初始砍价信息 record.setPressCurrentNum(0); - record.setPressEndDate(DateUtils.getHourTimeAfter(coupon.getPressLimitHours(), new Date())); + // 砍价券过期时间取券的过期时间和砍价限制时间中时间小的那个 + Date pressEndDate = DateUtils.getHourTimeAfter(coupon.getPressLimitHours(), new Date()); + if(pressEndDate.after(coupon.getValidEndDate())) + pressEndDate = coupon.getValidEndDate(); + record.setPressEndDate(pressEndDate); record.setPressCurrentValue(coupon.getPrice() - coupon.getSalePrice()); }