From ade84017d710125aeaa256bfea674640b16747db Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 17:46:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index 7504495..fbc3f65 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -473,7 +473,7 @@
}
// 楠岃瘉鏄惁鏈鍗�
CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);
- if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)
+ if (!firstOrder.getOrderNo().equals(orderNo) || firstOrder.getSourceType() != source)
return;
Date downTime = firstOrder.getThirdCreateTime();
@@ -483,7 +483,7 @@
return;
long registerTime = register.getCreateTime().getTime();
// 娉ㄥ唽48灏忔椂鍐呬笅鍗曢檺鍒�
- if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)
return;
// 鏄惁瀛樺湪涓婁笅绾у叧绯�
@@ -529,7 +529,7 @@
continue;
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
- if (payment == null || payment.compareTo(limitPayMent) < 0)
+ if (payment == null || payment.compareTo(limitPayMent) <= 0)
continue;
// 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
@@ -574,13 +574,14 @@
// 娉ㄥ唽48灏忔椂 浠ュ唴:鏂颁汉
long registerTime = register.getCreateTime().getTime();
// 48灏忔椂闄愬埗
- if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)
return satisfy;
+ // 楠岃瘉鏄惁鏈鍗�
CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);
- if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)
+ if (!firstOrder.getOrderNo().equals(orderNo) || firstOrder.getSourceType() != source)
return satisfy;
-
+
// 鏄惁宸插鍔�
List<UserSystemCoupon> coupons = userSystemCouponService.getUserCouponBySource(orderUid, UserSystemCoupon.SOURCE_PULL_NEW);
if (coupons != null && coupons.size() > 0) {
@@ -623,7 +624,7 @@
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
- if (payment == null || payment.compareTo(limitPayMent) < 0)
+ if (payment == null || payment.compareTo(limitPayMent) <= 0)
continue;
// 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
@@ -657,7 +658,7 @@
// 娉ㄥ唽48灏忔椂 浠ュ唴:鏂颁汉
long registerTime = register.getCreateTime().getTime();
// 48灏忔椂闄愬埗
- if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ if (downTime.getTime() > registerTime || downTime.getTime() < registerTime + 1000*60*60*48)
return;
// 鏄惁宸插鍔�
@@ -684,7 +685,7 @@
continue;
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
- if (payment == null || payment.compareTo(limitPayMent) < 0)
+ if (payment == null || payment.compareTo(limitPayMent) <= 0)
continue;
// 鍟嗗搧浣ｉ噾姣斾緥闄愬埗
--
Gitblit v1.8.0