From c8f11c229b87d1652b6da0b15576c166cd51eb8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 14:25:22 +0800
Subject: [PATCH] 首页悬浮图mapperbug修改，增加商品详情中的比例展示
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..938d19e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -162,7 +162,7 @@
doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
doOrderFanLiNew();// 鏂扮増杩斿埄
- doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
+// doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
@@ -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