From c7c552740330235706ac98e4fd67c5e2b3b10fdc Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 2 May 2017 16:24:22 +0800 Subject: [PATCH] =?UTF-8?q?sql=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/permission/dao/master/CouponMapper.java | 2 +- .../platform/permission/service/impl/CouponServiceImpl.java | 10 +++++++++- .../src/main/resources/mainOrm/master/CouponMapper.xml | 4 ++-- .../java/com/lyms/platform/common/result/ResponseCode.java | 4 ++++ .../lyms/platform/operate/web/controller/CouponController.java | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index ca6181e..6fc4612 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -15,7 +15,7 @@ public interface CouponMapper { void save(CouponInfo couponInfo); - List> findTemp(String hospitalId); + List> findTemp(Map map); String findTopName(String hospitalId); 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 15260b6..b2fcf28 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 @@ -46,7 +46,15 @@ public class CouponServiceImpl implements CouponService { @Override public BaseObjectResponse create(String userId, String hospitalId, Integer createUserId) { - List> temps = couponMapper.findTemp(hospitalId); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); + if(patients == null || patients.getType() == null) return RespBuilder.buildErro(ResponseCode.PATIENTS_NOT_FOUND); + + Map param = new HashMap<>(); + param.put("hospitalId", hospitalId); + param.put("type", patients.getType()); + List> temps = couponMapper.findTemp(param); + + if(CollectionUtils.isEmpty(temps)) return RespBuilder.buildErro(ResponseCode.COUPON_TEMP_NOT_FOUND); for (Map temp : temps) { Object sendType = temp.get("send_type"); if(sendType != null) {/** 1=全部发放 2=按有效时间发放 */ 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 4382795..fc59746 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -29,10 +29,10 @@ insert into coupon_info(id, ) values(#{id},#{sequenceId},#{createDate},#{useDate},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status}) - 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 + where a.hospital_id = #{hospitalId} and a.coupon_template_group_id = b.group_id and b.type_id = c.id and c.type=#{type} order by b.coupon_order 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 98aa8f6..57c095c 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 @@ -9,6 +9,10 @@ public enum ResponseCode { SUCCESS(0, "成功"), ERROR(500, "系统错误，请联系管理员"), + PATIENTS_NOT_FOUND(2001, "Patients未查询到或type为空"), + + COUPON_TEMP_NOT_FOUND(1006, "医院未绑定模板"), + COUPON_NOT_FOUND(1001, "优惠券不存在"), COUPON_NOT_UNIQUE(1002, "优惠券有多个"), COUPON_TIME_OUT(1003, "优惠券已过期"), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java index 799d49e..9df7f0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java @@ -32,7 +32,7 @@ public class CouponController extends BaseController { * @param hospitalId * @return */ - @RequestMapping(method = RequestMethod.POST, value = "/") + @RequestMapping(method = RequestMethod.POST) @ResponseBody @TokenRequired public BaseObjectResponse create(String userId, String hospitalId, HttpServletRequest request) { -- 1.8.3.1