Преглед изворни кода

coupons

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
654d7c81a8
1 измењених фајлова са 27 додато и 6 уклоњено
  1. +27
    -6
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java

+ 27
- 6
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<String,Object> map = new HashedMap();
// wxCouponChannel.setShowBeginTime(new Date());
// PageInfo<WxCouponChannelVo> 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);


Loading…
Откажи
Сачувај