From d376e6c58a760f4f9c4e58a010f63b598de8af79 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 28 Mar 2018 15:31:37 +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

---
 .../permission/service/impl/CouponServiceImpl.java     | 18 +++++++++++-------
 .../src/main/resources/mainOrm/master/CouponMapper.xml |  2 +-
 2 files changed, 12 insertions(+), 8 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 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<String,Object> 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 @@
     </insert>
 
     <select id="findTemp" parameterType="map" resultType="map">
-        select b.id, b.id as coupon_template_id, b.actual_start, b.actual_end, b.unit_type,b.show_start, c.send_type, c.type   from
+        select b.id, b.id as coupon_template_id, b.actual_start, b.actual_end, b.unit_type,b.show_start,b.show_end, c.send_type, c.type   from
         hospital_coupon_template_group a, coupon_template b, coupon_type c
         where a.hospital_id = #{hospitalId} and a.coupon_template_group_id = b.group_id and b.type_id = c.id and c.type in
         <foreach collection="types" open="(" close=")" separator="," item="type">
-- 
1.8.3.1