Commit 71faf06b47c62773c797dabcd2c1d3482b15cfcc
1 parent
d0087e39e6
Exists in
master
and in
6 other branches
优惠券报表
Showing 1 changed file with 7 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
View file @
71faf06
| ... | ... | @@ -208,9 +208,10 @@ |
| 208 | 208 | @RequestMapping(value = "/coupon", method = RequestMethod.GET) |
| 209 | 209 | public BaseObjectResponse coupon(HttpServletRequest request, Date startDate, Date endDate, |
| 210 | 210 | String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType) { |
| 211 | - Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, | |
| 211 | + /*Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, | |
| 212 | 212 | "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", |
| 213 | - areaId, "tempId", tempId, "couponType", couponType); | |
| 213 | + areaId, "tempId", tempId, "couponType", couponType);*/ | |
| 214 | + Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request),"hospitalId", hospitalId,"tempId", tempId, "couponType", "1,2,3,4,5,6,7,8"); | |
| 214 | 215 | return reportService.coupon(param); |
| 215 | 216 | } |
| 216 | 217 | |
| 217 | 218 | |
| ... | ... | @@ -234,9 +235,11 @@ |
| 234 | 235 | public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type, |
| 235 | 236 | String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, |
| 236 | 237 | Integer page, Integer limit) { |
| 237 | - Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, | |
| 238 | + /* Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, | |
| 238 | 239 | "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, |
| 239 | - "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit); | |
| 240 | + "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit);*/ | |
| 241 | + Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "hospitalId", hospitalId, "type", type, | |
| 242 | + "tempId", tempId, "couponType", CollectionUtils.asList("1,2,3,4,5,6,7,8"), "currentPage", page, "pageSize", limit); | |
| 240 | 243 | return reportService.couponInfo(param); |
| 241 | 244 | } |
| 242 | 245 |