| @@ -98,20 +98,14 @@ public class WxCouponChannelController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| // public ResultData listByMerchant(@RequestBody WxCouponChannel wxCouponChannel, @RequestBody Integer pageNum, @RequestBody Integer pageSize) { | // public ResultData listByMerchant(@RequestBody WxCouponChannel wxCouponChannel, @RequestBody Integer pageNum, @RequestBody Integer pageSize) { | ||||
| public ResultData listByMerchant(@RequestBody Map<String, Object> params) { | public ResultData listByMerchant(@RequestBody Map<String, Object> params) { | ||||
| String pageNumStr = (String) params.get("pageNum"); | |||||
| String pageSizeStr = (String) params.get("pageSize"); | |||||
| if(StringUtils.isBlank(pageNumStr) || StringUtils.isBlank(pageSizeStr)){ | |||||
| Integer pageNum = (Integer) params.get("pageNum"); | |||||
| Integer pageSize = (Integer) params.get("pageSize"); | |||||
| if(pageNum == null || pageSize == null){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| int pageNum = Integer.parseInt(pageNumStr); | |||||
| int pageSize = Integer.parseInt(pageSizeStr); | |||||
| String merchantIdStr = (String) params.get("merchantId"); | |||||
| Long merchantId = (Long) params.get("merchantId"); | |||||
| List<String> merchantIds = (List<String>) params.get("merchantIds"); | List<String> merchantIds = (List<String>) params.get("merchantIds"); | ||||
| Long merchantId = null; | |||||
| if(StringUtils.isNotBlank(merchantIdStr)){ | |||||
| merchantId =Long.parseLong(merchantIdStr); | |||||
| } | |||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setMerchantId(merchantId); | wxCouponChannel.setMerchantId(merchantId); | ||||