|
|
|
@@ -3,14 +3,12 @@ package com.iformall.controller; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.WxCUser; |
|
|
|
import com.iformall.domain.po.WxCouponOrder; |
|
|
|
import com.iformall.domain.vo.WxCardCVo; |
|
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
|
import com.iformall.enums.EnumCouponChannelActivityStatus; |
|
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
|
import com.iformall.enums.EnumCouponOrderValidStatus; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxCouponOrderService; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
@@ -51,11 +49,11 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); |
|
|
|
wxCouponOrder.setCUserId(getUserId()); |
|
|
|
if (wxCouponOrder.getCouponOrderStatus() == null) |
|
|
|
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); |
|
|
|
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC, WxCouponOrder.Field.Id_DESC); |
|
|
|
else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) |
|
|
|
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); |
|
|
|
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC, WxCouponOrder.Field.Id_DESC); |
|
|
|
else |
|
|
|
wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); |
|
|
|
wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC, WxCouponOrder.Field.Id_DESC); |
|
|
|
|
|
|
|
PageInfo<WxCouponOrderCVo> page = wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize); |
|
|
|
|
|
|
|
|