| @@ -67,22 +67,22 @@ public class WxCouponController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| @SystemControllerLog(description = "券投放-列表") | @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"); | logger.debug("[" + getIpAddr() + "] WxCouponController::list"); | ||||
| if (wxCoupon == null) wxCoupon = new WxCoupon(); | 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()){ | if(null == wxCoupon.getSourceType()){ | ||||
| wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); | wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); | ||||
| } | } | ||||
| //排序处理 | |||||
| if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ | if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ | ||||
| String coryColumn = "c."+wxCoupon.getSortColumns(); | String coryColumn = "c."+wxCoupon.getSortColumns(); | ||||
| wxCoupon.setSortColumns(coryColumn); | wxCoupon.setSortColumns(coryColumn); | ||||
| wxCoupon.setSortColumn(null); | wxCoupon.setSortColumn(null); | ||||
| } | } | ||||
| if(wxCoupon.getTargetAd() != null ){ | if(wxCoupon.getTargetAd() != null ){ | ||||
| if(wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode() | if(wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode() | ||||
| || wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.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 = { | Integer[] sendTypeArray = { | ||||
| EnumCouponSendType.ACTIVE.getCode(), | EnumCouponSendType.ACTIVE.getCode(), | ||||
| EnumCouponSendType.PASSIVE.getCode(),}; | EnumCouponSendType.PASSIVE.getCode(),}; | ||||