From 234850518f9da49a83ad137c7401e6192481cba4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Nov 2022 10:11:08 +0800 Subject: [PATCH] //coupon --- .../controller/market/WxCouponController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index c4065cc9d..8d2d6e84f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -67,22 +67,22 @@ 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,Boolean isList) { + public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); - if(null != dataType && dataType == 1){ - wxCoupon.updateTenantInfo(getTenantInfo()); - }else{ - wxCoupon.updateTenantInfo(getTenantInfo()); - } + wxCoupon.updateTenantInfo(getTenantInfo()); + + //默认A端建券 if(null == wxCoupon.getSourceType()){ wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); } + //排序处理 if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ String coryColumn = "c."+wxCoupon.getSortColumns(); wxCoupon.setSortColumns(coryColumn); wxCoupon.setSortColumn(null); } + if(wxCoupon.getTargetAd() != null ){ if(wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode() || wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()){ @@ -98,7 +98,8 @@ public class WxCouponController extends BaseController { } } - if(!(isList == null?false:isList) && wxCoupon.getSendType() == null){ + //isList true 查全部 / 否则 只查询主动领取和定向投放的。 + if(!(isList == null?false:isList)){ Integer[] sendTypeArray = { EnumCouponSendType.ACTIVE.getCode(), EnumCouponSendType.PASSIVE.getCode(),};