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 bfc7ecf..67a3b8c 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 @@ -181,21 +181,25 @@ 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) + + if (person.getType() == 1 && type == 2) { - if (type == 2 && ((showStart <= start && showEnd >= start) || showStart >= start)) + Integer showStart = Integer.parseInt(map.get("show_start").toString()); + Integer showEnd = Integer.parseInt(map.get("show_end").toString()); + if ((showStart <= start && showEnd >= start) || showStart >= start) { list.add(map); } } - else if (person.getType() == 3) + else if (person.getType() == 3 && type == 6) { - if (type == 6 && ((showStart <= start && showEnd >= start) || showStart >= start)) + Integer showStart = Integer.parseInt(map.get("show_start").toString()); + Integer showEnd = Integer.parseInt(map.get("show_end").toString()); + if ((showStart <= start && showEnd >= start) || showStart >= start) { - list.add(map); + } + list.add(map); } } } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index 4acf725..a7ac712 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -59,7 +59,7 @@