From 9f56a3478708633de7e5f013901a4539b01b638c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 30 六月 2020 12:05:50 +0800
Subject: [PATCH] 订单结算时的红包
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 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 1ef7ecf..df12626 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
@@ -467,26 +467,25 @@
@Override
@RequestSerializableByKeyService(key = "#orderUid")
@Transactional(rollbackFor = Exception.class)
- public void winRedPackByOrder(Long orderUid, String orderNo, Integer source, Date downTime) {
+ public void winRedPackByOrder(Long orderUid, String orderNo, Integer source) {
if (orderUid == null || StringUtil.isNullOrEmpty(orderNo)) {
return;
}
-
- // 娉ㄥ唽鏃堕棿
- UserInfoRegister register = userInfoRegisterService.selectByPrimaryKey(orderUid);
- if (register == null)
- return;
- // 娉ㄥ唽48灏忔椂 浠ュ唴 :鏂颁汉
- long registerTime = register.getCreateTime().getTime();
- // 48灏忔椂闄愬埗
- 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;
+ Date downTime = firstOrder.getThirdCreateTime();
+ // 娉ㄥ唽鏃堕棿
+ UserInfoRegister register = userInfoRegisterService.selectByPrimaryKey(orderUid);
+ if (register == null)
+ return;
+ long registerTime = register.getCreateTime().getTime();
+ // 娉ㄥ唽48灏忔椂鍐呬笅鍗曢檺鍒�
+ if (downTime.getTime() < registerTime || downTime.getTime() > registerTime + 1000*60*60*48)
+ return;
+
// 鏄惁瀛樺湪涓婁笅绾у叧绯�
ThreeSale threeSale = threeSaleSerivce.getByWorkerId(orderUid);
if (threeSale == null)
@@ -495,17 +494,17 @@
if (bossId == null)
return;
+ // 璇ラ個璇锋槸鍚﹀凡娣诲姞
+ RedPackWinInvite threeStage = redPackWinInviteMapper.getByUidAndTeamUid(bossId, orderUid);
+ if (threeStage != null)
+ return;
+
// 灏忎簬2.1.3鐗堟湰涓嶅鍔�
UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);
if (activeLog == null)
return;
if (!VersionUtil.greaterThan_2_1_3("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",
activeLog.getVersionCode()))
- return;
-
- // 璇ラ個璇锋槸鍚﹀凡娣诲姞
- RedPackWinInvite threeStage = redPackWinInviteMapper.getByUidAndTeamUid(bossId, orderUid);
- if (threeStage != null)
return;
// 鏌ヨ璁㈠崟
@@ -520,8 +519,8 @@
boolean satisfy = false;
// 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
for (CommonOrder commonOrder: list) {
- // 璁㈠崟澶辨晥
- if(commonOrder.getState() != CommonOrder.STATE_FK && commonOrder.getState() != CommonOrder.STATE_JS)
+ // 璁㈠崟鏈粨绠�
+ if(commonOrder.getState() != CommonOrder.STATE_JS)
continue;
// 閭�璇峰叧绯讳箣鍚�
--
Gitblit v1.8.0