From 04b20e3c48e0154b9f580180c774243181a14906 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 28 Mar 2018 15:15:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/service/impl/CouponServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index ab8d63b..bfc7ecf 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -180,20 +180,19 @@ public class CouponServiceImpl implements CouponService { for (Map map : temps) { + Integer type = Integer.parseInt(map.get("type").toString()); + Integer showStart = Integer.parseInt(map.get("show_start").toString()); + Integer showEnd = Integer.parseInt(map.get("show_end").toString()); if (person.getType() == 1) { - Integer type = Integer.parseInt(map.get("type").toString()); - Integer showStart = Integer.parseInt(map.get("show_start").toString()); - if (type == 2 && showStart <= start) + if (type == 2 && ((showStart <= start && showEnd >= start) || showStart >= start)) { list.add(map); } } else if (person.getType() == 3) { - Integer type = Integer.parseInt(map.get("type").toString()); - Integer showStart = Integer.parseInt(map.get("show_start").toString()); - if (type == 6 && showStart <= start) + if (type == 6 && ((showStart <= start && showEnd >= start) || showStart >= start)) { list.add(map); } -- 1.8.3.1