From 0272ffc3e7037e10c2ddadeea6c597850903878f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 八月 2019 14:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
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