Commit ca10c7824f1dcfbb4cc973efe46952d7181b35ce
1 parent
41d62f4aa1
Exists in
master
and in
1 other branch
优惠券报表
Showing 1 changed file with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
View file @
ca10c78
| ... | ... | @@ -225,17 +225,18 @@ |
| 225 | 225 | * @param hospitalId 医院id |
| 226 | 226 | * @param tempId 模板id |
| 227 | 227 | * @param couponType 优惠券类型 |
| 228 | + * @param type 查询类型 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数 | |
| 228 | 229 | * @return |
| 229 | 230 | */ |
| 230 | 231 | @ResponseBody |
| 231 | 232 | @TokenRequired |
| 232 | 233 | @RequestMapping(value = "/coupon/info", method = RequestMethod.GET) |
| 233 | - public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, | |
| 234 | + public BaseObjectResponse couponInfo(HttpServletRequest request, Date startDate, Date endDate, Integer type, | |
| 234 | 235 | String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType, |
| 235 | - Integer currentPage, Integer pageSize) { | |
| 236 | + Integer page, Integer limit) { | |
| 236 | 237 | Map<String, Object> param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate, |
| 237 | - "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", | |
| 238 | - areaId, "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", currentPage, "pageSize", pageSize); | |
| 238 | + "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId", areaId, "type", type, | |
| 239 | + "tempId", tempId, "couponType", CollectionUtils.asList(couponType), "currentPage", page, "pageSize", limit); | |
| 239 | 240 | return reportService.couponInfo(param); |
| 240 | 241 | } |
| 241 | 242 |