| @@ -45,34 +45,34 @@ public class WxCouponSendController extends BaseController { | |||
| private WxCUserMapper wxCUserMapper; | |||
| //TODO 待优化数据 | |||
| // @ApiOperation("查询商户注券列表") | |||
| // @GetMapping("/list") | |||
| // @ApiImplicitParams({ | |||
| // @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||
| // @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | |||
| // }) | |||
| // public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { | |||
| // logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); | |||
| // if (Objects.isNull(wxCouponSend.getSendType())) { | |||
| // return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||
| // } | |||
| // wxCouponSend.updateTenantInfo(getTenantInfo()); | |||
| // wxCouponSend.setMerchantId(getLoginBUser().getMerchantId()); | |||
| // if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { | |||
| // wxCouponSend.setMerchantRemain(0); | |||
| // } | |||
| // wxCouponSend.setStatus(wxCouponSend.getStatus()); | |||
| // //库存大于0 | |||
| // if (Objects.isNull(wxCouponSend.getSortColumn())) { | |||
| // wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||
| // } | |||
| // final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); | |||
| // | |||
| // for (WxCouponSendVo cs : page.getList()) { | |||
| // cs.setSendCount(wxCouponActionLogService.getCountByChannelId(wxCouponSend, cs.getSendType(), cs.getId())); | |||
| // } | |||
| // return new ResultData(page); | |||
| // } | |||
| @ApiOperation("查询商户注券列表") | |||
| @GetMapping("/list") | |||
| @ApiImplicitParams({ | |||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | |||
| }) | |||
| public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { | |||
| logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); | |||
| if (Objects.isNull(wxCouponSend.getSendType())) { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||
| } | |||
| wxCouponSend.updateTenantInfo(getTenantInfo()); | |||
| wxCouponSend.setMerchantId(getLoginBUser().getMerchantId()); | |||
| if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { | |||
| wxCouponSend.setMerchantRemain(0); | |||
| } | |||
| wxCouponSend.setStatus(wxCouponSend.getStatus()); | |||
| //库存大于0 | |||
| if (Objects.isNull(wxCouponSend.getSortColumn())) { | |||
| wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||
| } | |||
| final PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); | |||
| for (WxCouponSendVo cs : page.getList()) { | |||
| cs.setSendCount(wxCouponActionLogService.getCountByChannelId(wxCouponSend, cs.getSendType(), cs.getId())); | |||
| } | |||
| return new ResultData(page); | |||
| } | |||
| @ApiOperation("商户注券") | |||
| @PostMapping("/handSel") | |||