From f94a5a1d3fe9bde0e599d41f2d97caea1b08a88d Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 29 六月 2020 15:48:12 +0800 Subject: [PATCH] 免单调整 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java index 8e3f872..8bd29b0 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java @@ -387,7 +387,7 @@ List<CommonOrderVO> list = null; if (NumberUtil.isNumeric(key.replace("-", ""))) { if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) { - commonOrderService.getOrderList(acceptData, page, uid, null, null, null, key, null, null, null,listSource); + list = commonOrderService.getOrderList(acceptData, page, uid, null, null, null, key, null, null, null,listSource); } else list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null, listSource); } @@ -809,7 +809,7 @@ long currentTime = java.lang.System.currentTimeMillis(); if (endDay.getTime() > currentTime && !vip) { UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo, - null); + sourceType, null); if (couponRecord == null) { orderRebateVO.setCoupon(true); orderRebateVO.setCouponType(1); -- Gitblit v1.8.0