| @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | import com.iformall.domain.vo.WxCardSpendVo; | ||||
| import com.iformall.domain.vo.WxCardVo; | import com.iformall.domain.vo.WxCardVo; | ||||
| @@ -79,6 +80,7 @@ public class WxCardPayController extends BaseController { | |||||
| wxCardVo.setStatusS(tmpList); | wxCardVo.setStatusS(tmpList); | ||||
| } | } | ||||
| } | } | ||||
| wxCardSpendVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| final PageInfo<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); | final PageInfo<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -110,6 +112,7 @@ public class WxCardPayController extends BaseController { | |||||
| sources.add(EnumMerchantSubsidySource.CARD.getCode()); | sources.add(EnumMerchantSubsidySource.CARD.getCode()); | ||||
| wxCardSpendVo.setSources(sources); | wxCardSpendVo.setSources(sources); | ||||
| wxCardSpendVo.setCardSpendListShow(1); | wxCardSpendVo.setCardSpendListShow(1); | ||||
| wxCardSpendVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | |||||
| final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); | final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||