From 586075969efdbda64b71b037a1b714ebfca5e70d Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 2 Aug 2017 21:47:39 +0800 Subject: [PATCH] 1 --- .../com/lyms/platform/permission/dao/master/CouponMapper.java | 2 ++ .../com/lyms/platform/permission/service/CouponService.java | 3 ++- .../platform/permission/service/impl/CouponServiceImpl.java | 10 +++++++++- .../src/main/resources/mainOrm/master/CouponMapper.xml | 4 ++++ .../java/com/lyms/platform/common/result/ResponseCode.java | 1 + .../lyms/platform/operate/web/controller/CouponController.java | 9 ++++++++- 6 files changed, 26 insertions(+), 3 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 fd1a143..762b43f 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 @@ -94,4 +94,6 @@ public interface CouponMapper { Map findCouponByCode(Map param); int updateCouponStatus(Map param); + + CouponInfo findUserCoupon(Map param); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index ae00ead..774054d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -1,7 +1,6 @@ package com.lyms.platform.permission.service; import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.permission.model.CouponInfo; import java.util.List; import java.util.Map; @@ -47,4 +46,6 @@ public interface CouponService{ BaseObjectResponse validateUse(String code, Integer type, String hospitalId); int updateCouponStatus(Map param); + + boolean validateUser(String userId, String code); } 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 bc29022..a928769 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 @@ -7,7 +7,6 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.HttpClientUtil; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.PropertiesUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.CouponInfo; @@ -546,6 +545,15 @@ public class CouponServiceImpl implements CouponService { } @Override + public boolean validateUser(String userId, String code) { + Map map = new HashMap<>(); + map.put("userId", userId); + map.put("code", code); + CouponInfo couponInfo = couponMapper.findUserCoupon(map); + return couponInfo == null ? false : true; + } + + @Override public List> queryCouponItemsByType(Map params) { return couponMapper.queryCouponItemsByType(params); } 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 6f35b69..d853258 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -23,6 +23,10 @@ sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status,temp_hospital_id,temp_status + + 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 e6c24c0..d96d609 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 @@ -29,6 +29,7 @@ public enum ResponseCode { COUPON_IS_USERD(1004, "优惠券已被使用"), COUPON_IS_DISABLED(1005, "优惠券已被禁用"), COUPON_IS_USED(1006, "当前优惠劵已经在其他医院使用，不能重复使用"), + COUPON_IS_NOT_SELF(1007, "当前优惠劵不属于本人"), NEED_BUILD(1101, "未找到建档信息"); 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 118d7dc..82c4eb5 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 @@ -8,7 +8,9 @@ import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.PropertiesUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.pojo.PlantformConfigModel; @@ -90,7 +92,12 @@ public class CouponController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/validate/{code}/{type}") @ResponseBody @TokenRequired - public BaseObjectResponse validate(@PathVariable String code, @PathVariable Integer type, HttpServletRequest request) { + public BaseObjectResponse validate(@PathVariable String code, @PathVariable Integer type, String userId, HttpServletRequest request) { + if(StringUtils.isNotEmpty(userId)) { + if(!couponService.validateUser(userId, code)) { /** 优惠券不属于本人 */ + return RespBuilder.buildErro(ResponseCode.COUPON_IS_USED); + } + } return couponService.validate(code, type, autoMatchFacade.getHospitalId(getUserId(request))); } -- 1.8.3.1