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 0cca93e..6188010 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -775,7 +775,20 @@ #{key} - + + + and d.province_id = #{provinceId} + + + and d.city_id = #{cityId} + + + and d.area_id = #{areaId} + + + and d.street_id = #{streetId} + + and b.coupon_order = #{coupon_order} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java index 40c0833..a962796 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrgCouponController.java @@ -33,11 +33,18 @@ public class OrgCouponController extends BaseController { @RequestMapping(value = "/coupon/info", method = RequestMethod.GET) public BaseObjectResponse orgCouponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type, String couponType, String doctor, - Integer page, Integer limit, String key) { + Integer page, Integer limit, String key, + Integer provinceId, Integer cityId, Integer areaId, Integer streetId) { String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, "endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", type, "couponType", couponType, "currentPage", page, "pageSize", limit, "doctor", doctor, "key", key); + //隆化居住地筛选参数 + param.put("provinceId", provinceId); + param.put("cityId", cityId); + param.put("areaId", areaId); + param.put("streetId", streetId); + return orgCouponService.orgCouponInfo(param); }