|
|
@@ -9,12 +9,8 @@ import com.iformall.controller.app.WxAppinfoController; |
|
|
import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.controller.base.BaseController; |
|
|
import com.iformall.domain.dto.WxCouponChannelDto; |
|
|
import com.iformall.domain.dto.WxCouponChannelDto; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.vo.WxCouponChannelAddVo; |
|
|
|
|
|
import com.iformall.domain.vo.WxCouponChannelVo; |
|
|
import com.iformall.domain.vo.WxCouponChannelVo; |
|
|
import com.iformall.enums.EnumCouponChannelStatus; |
|
|
|
|
|
import com.iformall.enums.EnumFlowRecordStatus; |
|
|
|
|
|
import com.iformall.enums.EnumRentContractAppStatus; |
|
|
|
|
|
import com.iformall.enums.EnumRentContractStatus; |
|
|
|
|
|
|
|
|
import com.iformall.enums.*; |
|
|
import com.iformall.mapper.WxCouponChannelMapper; |
|
|
import com.iformall.mapper.WxCouponChannelMapper; |
|
|
import com.iformall.service.QrCodeService; |
|
|
import com.iformall.service.QrCodeService; |
|
|
import com.iformall.service.WxCouponChannelService; |
|
|
import com.iformall.service.WxCouponChannelService; |
|
|
@@ -24,7 +20,6 @@ import io.swagger.annotations.Api; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import io.swagger.annotations.ApiOperation; |
|
|
import org.apache.commons.collections.CollectionUtils; |
|
|
|
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.Logger; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.slf4j.LoggerFactory; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
@@ -66,6 +61,10 @@ public class WxCouponChannelController extends BaseController { |
|
|
if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { |
|
|
if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { |
|
|
wxCouponChannel.setStatus(null); |
|
|
wxCouponChannel.setStatus(null); |
|
|
} |
|
|
} |
|
|
|
|
|
if (wxCouponChannel.getTargetAd() != null && wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode())) { |
|
|
|
|
|
// 卡频道过滤掉免费卡 |
|
|
|
|
|
wxCouponChannel.setSendType(EnumCouponSendType.ACTIVE.getCode()); |
|
|
|
|
|
} |
|
|
wxCouponChannel.setTenantId(getTenantId()); |
|
|
wxCouponChannel.setTenantId(getTenantId()); |
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); |
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); |
|
|
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); |
|
|
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); |
|
|
|