|
|
@@ -10,6 +10,7 @@ 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.WxCouponChannelVo; |
|
|
import com.iformall.domain.vo.WxCouponChannelVo; |
|
|
|
|
|
import com.iformall.enums.EnumCouponSourceType; |
|
|
import com.iformall.enums.EnumPayWay; |
|
|
import com.iformall.enums.EnumPayWay; |
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
import com.iformall.domain.vo.WxCouponChannelVo; |
|
|
import com.iformall.domain.vo.WxCouponChannelVo; |
|
|
@@ -68,10 +69,13 @@ public class WxCouponChannelController extends BaseController { |
|
|
wxCouponChannel.updateTenantInfo(getTenantInfo()); |
|
|
wxCouponChannel.updateTenantInfo(getTenantInfo()); |
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); |
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); |
|
|
|
|
|
|
|
|
|
|
|
if(null == wxCouponChannel.getSourceType()){ |
|
|
|
|
|
wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ |
|
|
if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ |
|
|
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); |
|
|
wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); |
|
|
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
|