|
|
|
@@ -237,7 +237,9 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
if (pageNum == null || pageSize == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
if (cardCVo == null) cardCVo = new WxCardCVo(); |
|
|
|
if (cardCVo == null) { |
|
|
|
cardCVo = new WxCardCVo(); |
|
|
|
} |
|
|
|
cardCVo.updateTenantInfo(getTenantInfo()); |
|
|
|
cardCVo.setOwnerId(getUserId()); |
|
|
|
if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { |
|
|
|
@@ -250,12 +252,13 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
cardCVo.setStatusS(tmpList); |
|
|
|
} |
|
|
|
} |
|
|
|
if (cardCVo.getCouponOrderStatus() == null) |
|
|
|
if (cardCVo.getCouponOrderStatus() == null) { |
|
|
|
cardCVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); |
|
|
|
else if (cardCVo.getCouponOrderStatus() == EnumCouponOrderStatus.CARD_USING.getCode()) |
|
|
|
} else if (cardCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.CARD_USING.getCode())) { |
|
|
|
cardCVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); |
|
|
|
else |
|
|
|
} else { |
|
|
|
cardCVo.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); |
|
|
|
} |
|
|
|
return wxCouponOrderService.listCardVoAsPage(cardCVo, pageNum, pageSize); |
|
|
|
} |
|
|
|
|
|
|
|
|