From 0cd6e70348ffbfe086bf02d46516e4c47faf4537 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 15 May 2017 20:20:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E8=A7=84=E5=88=99=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/permission/service/impl/CouponServiceImpl.java | 8 ++++++++ .../src/main/resources/mainOrm/master/CouponMapper.xml | 1 - .../main/java/com/lyms/platform/common/result/ResponseCode.java | 2 +- 3 files changed, 9 insertions(+), 2 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 cd8c203..321df78 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 @@ -168,6 +168,14 @@ public class CouponServiceImpl implements CouponService { if("1".equals(sendType.toString())) { couponMapper.save(couponInfo); } else if("2".equals(sendType.toString())) { + + /** 孕妇 > 分娩、出院小结、产后复查【分娩券、出院小结券、产后复查券全部发放】 */ + List list = Arrays.asList("4", "5", "6"); + if(personType == 1 && list.contains(temp.get("type").toString())) { + couponMapper.save(couponInfo); + continue; + } + Object actualStart = temp.get("actual_start"); Object actualEnd = temp.get("actual_end"); Object unitType = temp.get("unit_type"); 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 b13320a..bb32ee8 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -44,7 +44,6 @@ select b.id, b.id as coupon_template_id, b.actual_start, b.actual_end, b.unit_type, 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 - /*(4, 5, 6)*/ #{type} diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java index fed7171..495dd86 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java @@ -20,7 +20,7 @@ public enum ResponseCode { COUPON_NOT_FOUND(1001, "优惠券不存在"), COUPON_NOT_UNIQUE(1002, "优惠券有多个"), - COUPON_TIME_OUT(1003, "优惠券已过期"), + COUPON_TIME_OUT(1003, "当前优惠券不在使用时间范围内"), COUPON_IS_USERD(1004, "优惠券已被使用"), COUPON_IS_DISABLED(1005, "优惠券已被禁用"); -- 1.8.3.1