From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 28 八月 2019 14:47:15 +0800 Subject: [PATCH] 奖励券使用区分订单下单三方日期 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java index a227f4a..30209f2 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java @@ -119,13 +119,11 @@ changeJump = true; } - long count = 0; + long count = UserSystemCouponService.countCouponOld(uid); List<UserSystemCouponVO> resultList = UserSystemCouponService .getUserCouponVOList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, changeJump); - if (resultList != null && resultList.size() > 0) { - count = UserSystemCouponService.countUserCouponList(uid); - } else if (resultList == null) { + if (resultList == null) { resultList = new ArrayList<UserSystemCouponVO>(); } -- Gitblit v1.8.0