From a4e938874dbc0376125324cb170f5885f88da8a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 十一月 2019 16:45:51 +0800
Subject: [PATCH] 板栗商城退款修改，获取用户的会员运营ID与渠道ID修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
index e0305c6..77a822c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
@@ -110,7 +110,7 @@
long count = UserSystemCouponService.countUserCouponList(uid);
- List<UserSystemCouponVO> resultList = UserSystemCouponService.getCouponList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+ List<UserSystemCouponVO> resultList = UserSystemCouponService.getCouponList(acceptData,(page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
if (resultList == null) {
resultList = new ArrayList<UserSystemCouponVO>();
}
@@ -199,7 +199,7 @@
}
boolean valid = false;
- long limitDate = TimeUtil.convertDateToTemp("2019-09-01");
+ long limitDate = TimeUtil.convertDateToTemp("2019-09-10");
for (CommonOrder commonOrder: listOrder) {
Integer wholeOrder = commonOrder.getStateWholeOrder();
if (wholeOrder != null && CommonOrder.STATE_WHOLE_ORDER_SHIXIAO == wholeOrder) {
--
Gitblit v1.8.0