Просмотр исходного кода

[统计][添加][增加导出待缴商户]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
a8f240400e
4 измененных файлов: 15 добавлений и 7 удалений
  1. +5
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +7
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponService.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 5
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -182,8 +182,11 @@ public class WxCouponController extends BaseController {

@ApiOperation("商户活动列表信息")
@GetMapping("findByMerchant")
public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) {
return new ResultData(wxCouponService.findByMerchant(wxCoupon));
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
return new ResultData(wxCouponService.findByMerchant(wxCoupon,pageNum,pageSize));
}

}

+ 7
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -80,10 +80,15 @@ public class WxCouponController extends BaseController {
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
}


@ApiOperation("商户活动列表信息")
@GetMapping("findByMerchant")
public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) {
return new ResultData(wxCouponService.findByMerchant(wxCoupon));
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
return new ResultData(wxCouponService.findByMerchant(wxCoupon,pageNum,pageSize));
}


}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponService.java Просмотреть файл

@@ -204,5 +204,5 @@ public interface WxCouponService {
* @param wxCoupon
* @return
*/
List<WxCoupon> findByMerchant(WxCoupon wxCoupon);
PageInfo<WxCoupon> findByMerchant(WxCoupon wxCoupon,Integer pageNum, Integer pageSize);
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -538,7 +538,7 @@ public class WxCouponServiceImpl implements WxCouponService {
}

@Override
public List<WxCoupon> findByMerchant(WxCoupon wxCoupon) {
return wxCouponMapper.findByMerchant(wxCoupon);
public PageInfo<WxCoupon> findByMerchant(WxCoupon wxCoupon,Integer pageNum, Integer pageSize) {
return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findByMerchant(wxCoupon));
}
}

Загрузка…
Отмена
Сохранить