From fed386fafac07d40fa3f3627b8fcef13e2d2ec4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 四月 2020 14:41:46 +0800
Subject: [PATCH] 分红修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 da8b15f..05e35b3 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
@@ -749,14 +749,14 @@
}
} else {
Date accountTime = hongBaoV2.getGetTime();
- if (accountTime != null) {
+ // 鍒拌处鏃堕棿 -绾㈠寘閲戦闄愬埗
+ if (accountTime != null && hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) <= 0) {
boolean vip = userInviteService.verifyVIP(uid);
Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
long currentTime = java.lang.System.currentTimeMillis();
if (endDay.getTime() > currentTime && !vip) {
UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
- if (couponRecord == null
- || (couponRecord.getCouponType() == CouponTypeEnum.rebatePercentCoupon.name() && couponRecord.getState() != UserSystemCouponRecord.STATE_SUCCESS)) {
+ if (couponRecord == null) {
orderRebateVO.setCoupon(true);
orderRebateVO.setCouponType(1);
orderRebateVO.setCouponText("绔嬪嵆浣跨敤");
--
Gitblit v1.8.0