From 0f9a0a76b170bceac867dd5cd009e518ac6646e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 20 十一月 2019 11:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index 751df38..ac33d18 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -840,14 +840,28 @@
private void fanliGetIntegral(HongBaoV2 hongBaoV2) {
if (hongBaoV2 != null && hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU
&& hongBaoV2.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ // 鏌ヨ瀵瑰簲鐨勮鍗曞彿
+ Long mainHongBaoId = hongBaoV2.getId();
+ if (hongBaoV2.getParent() != null && hongBaoV2.getParent().getId() != null)
+ mainHongBaoId = hongBaoV2.getParent().getId();
+
+ HongBaoOrder hongbaoOrder = hongBaoOrderService.selectDetailByHongBaoId(mainHongBaoId);
+ if (hongbaoOrder == null || hongbaoOrder.getCommonOrder() == null)
+ return;
+ CommonOrder commonOrder = hongbaoOrder.getCommonOrder();
+
if (hongBaoV2.getType() == HongBaoV2.TYPE_ZIGOU) {// 鑷喘璁㈠崟
- integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId());
+ integralGetService.addRebateOrder(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
} else if (hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_GOODS) {// 鍒嗕韩璁㈠崟
- integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId());
+ integralGetService.addShareOrder(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
} else if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾ч個璇�
- integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId());
+ integralGetService.addInviteOrderLevelOne(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
} else if (hongBaoV2.getType() == HongBaoV2.TYPE_ERJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇閭�璇�
- integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId());
+ integralGetService.addInviteOrderLevelTwo(hongBaoV2.getUserInfo().getId(), commonOrder.getOrderNo(),
+ commonOrder.getSourceType());
}
}
}
--
Gitblit v1.8.0