From b457131dda80427bbd47b05b9ad27366cafa1718 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 30 六月 2020 11:37:48 +0800
Subject: [PATCH] 首单 + 发单日志记录
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 9842079..1ef7ecf 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
@@ -482,6 +482,11 @@
if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
return;
+ // 楠岃瘉鏄惁鏈鍗�
+ CommonOrder firstOrder = commonOrderService.getFirstOrder(orderUid);
+ if (!firstOrder.getOrderNo().equals(orderNo) && firstOrder.getSourceType() != source)
+ return;
+
// 鏄惁瀛樺湪涓婁笅绾у叧绯�
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(orderUid);
if (threeSale == null)
@@ -515,6 +520,10 @@
boolean satisfy = false;
// 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
for (CommonOrder commonOrder: list) {
+ // 璁㈠崟澶辨晥
+ if(commonOrder.getState() != CommonOrder.STATE_FK && commonOrder.getState() != CommonOrder.STATE_JS)
+ continue;
+
// 閭�璇峰叧绯讳箣鍚�
long thirdTime = commonOrder.getThirdCreateTime().getTime();
if (thirdTime < threeSale.getCreateTime())
@@ -569,6 +578,10 @@
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)
+ return satisfy;
+
// 鏄惁宸插鍔�
List<UserSystemCoupon> coupons = userSystemCouponService.getUserCouponBySource(orderUid, UserSystemCoupon.SOURCE_PULL_NEW);
if (coupons != null && coupons.size() > 0) {
@@ -605,6 +618,10 @@
long thirdTime = commonOrder.getThirdCreateTime().getTime();
if (thirdTime < threeSale.getCreateTime())
continue;
+ // 璁㈠崟澶辨晥
+ if(commonOrder.getState() != CommonOrder.STATE_FK && commonOrder.getState() != CommonOrder.STATE_JS)
+ continue;
+
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
if (payment == null || payment.compareTo(limitPayMent) < 0)
--
Gitblit v1.8.0