|
|
|
@@ -62,7 +62,7 @@ public class WxCouponController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
@SystemControllerLog(description = "券投放-列表") |
|
|
|
public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType) { |
|
|
|
public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType,Boolean isList) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCouponController::list"); |
|
|
|
if (wxCoupon == null) wxCoupon = new WxCoupon(); |
|
|
|
if(null != dataType && dataType == 1){ |
|
|
|
@@ -88,11 +88,15 @@ public class WxCouponController extends BaseController { |
|
|
|
|
|
|
|
wxCoupon.setTypes(Arrays.asList(typeArray)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(!(isList == null?false:isList)){ |
|
|
|
Integer[] sendTypeArray = { |
|
|
|
EnumCouponSendType.ACTIVE.getCode(), |
|
|
|
EnumCouponSendType.PASSIVE.getCode(),}; |
|
|
|
wxCoupon.setSendTypes(Arrays.asList(sendTypeArray)); |
|
|
|
} |
|
|
|
|
|
|
|
return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 |
|
|
|
} |
|
|
|
|
|
|
|
|