From 654d7c81a85da0258329b7ebd6f3004605f5c50d Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 12 Mar 2021 12:22:14 +0800 Subject: [PATCH] coupons --- .../controller/WxCouponChannelController.java | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 9c630d296..7a165a250 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -8,10 +8,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; import com.iformall.annotation.RedisCache; @@ -68,12 +65,36 @@ public class WxCouponChannelController extends BaseController { } +// @ApiOperation("商户活动列表信息") +// @GetMapping("listByMerchant") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), +// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) +// public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { +// wxCouponChannel.updateTenantInfo(getTenantInfo()); +// wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); +// wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); +// +// Map map = new HashedMap(); +// wxCouponChannel.setShowBeginTime(new Date()); +// PageInfo page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); +// filterTimed(wxCouponChannel, page); +// +// if(wxCouponChannel.getMerchantId() != null){ +// WxMerchant wm = wxMerchantService.getById(wxCouponChannel.getMerchantId()); +// map.put("qrCode",wm.getQrCode()); +// } +// +// map.put("page",page); +// return new ResultData(map); +// } + @ApiOperation("商户活动列表信息") - @GetMapping("listByMerchant") + @PostMapping("listByMerchant") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { + public ResultData listByMerchant(@RequestBody WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC);