jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 22 additions and 2 deletions

...	...	@@ -775,7 +775,20 @@
775	775	#{key}
776	776	</foreach>
777	777	</if>
778		-
	778	+<!-- 隆化居住地筛选参数 -->
	779	+ <if test="provinceId != null">
	780	+ and d.province_id = #{provinceId}
	781	+ </if>
	782	+ <if test="cityId != null">
	783	+ and d.city_id = #{cityId}
	784	+ </if>
	785	+ <if test="areaId != null">
	786	+ and d.area_id = #{areaId}
	787	+ </if>
	788	+ <if test="streetId != null">
	789	+ and d.street_id = #{streetId}
	790	+ </if>
	791	+<!-- ################################## -->
779	792	<if test="coupon_order != null">
780	793	and b.coupon_order = #{coupon_order}
781	794	</if>

...	...	@@ -33,11 +33,18 @@
33	33	@RequestMapping(value = "/coupon/info", method = RequestMethod.GET)
34	34	public BaseObjectResponse orgCouponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type,
35	35	String couponType, String doctor,
36		- Integer page, Integer limit, String key) {
	36	+ Integer page, Integer limit, String key,
	37	+ Integer provinceId, Integer cityId, Integer areaId, Integer streetId) {
37	38	String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
38	39	Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
39	40	"endDate", endDate != null ? DateUtil.addDay(endDate, 1) : endDate, "hospitalId", CollectionUtils.asList(hospitalId), "type", type,
40	41	"couponType", couponType, "currentPage", page, "pageSize", limit, "doctor", doctor, "key", key);
	42	+ //隆化居住地筛选参数
	43	+ param.put("provinceId", provinceId);
	44	+ param.put("cityId", cityId);
	45	+ param.put("areaId", areaId);
	46	+ param.put("streetId", streetId);
	47	+
41	48	return orgCouponService.orgCouponInfo(param);
42	49	}
43	50