From 6f98b96e4331f004a724a12b552537f4c8721ad8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 14 Jun 2020 10:40:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E7=A0=81html][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCouponOrderController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index e360fbb04..4c6285815 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -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); }