From 305e21ad6339174aae0bc917e9c3d5ec92ff299f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 17:06:18 +0800
Subject: [PATCH] 用户等级增加导师
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
index b8ff19b..cf9b5e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -476,7 +476,7 @@
}
}
- HongBaoV2 hongBao = createFanLiHongBao(commonOrder, fanliRate, mianDanMoney, vip);
+ HongBaoV2 hongBao = createFanLiHongBao(commonOrder, fanliRate, mianDanMoney);
if (hongBao == null)
return;
addFanLiOrShareHongBao(hongBao, commonOrder, notificationMap);
@@ -635,7 +635,8 @@
UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid);
if (user == null)
return null;
- boolean isVIP = userVIPInfoService.isVIP(uid);
+
+ UserLevelEnum level = userLevelManager.getUserLevel(uid);
HongBaoV2 child = new HongBaoV2();
child.setParent(parent);
@@ -654,13 +655,11 @@
}
child.setUserInfo(user);
- child.setUrank(user.getRank());
+ child.setUrank(level.getOrderRank());
child.setVersion(2);
child.setCreateTime(new Date());
child.setOrderType(commonOrder.getSourceType());
if (child.getMoney() == null)
- return null;
- if (child.getMoney().compareTo(new BigDecimal(0)) <= 0 && !isVIP)
return null;
return child;
}
@@ -673,13 +672,11 @@
* -杩斿埄姣斾緥
* @param mianDanMoney
* 鍏嶅崟閲戦
- * @param isVIP-鏄惁涓篤IP璁㈠崟
* @return
* @throws HongBaoException
* @throws UserAccountException
*/
- private HongBaoV2 createFanLiHongBao(CommonOrder commonOrder, BigDecimal fanliRate, BigDecimal mianDanMoney,
- boolean isVIP) throws HongBaoException, UserAccountException {
+ private HongBaoV2 createFanLiHongBao(CommonOrder commonOrder, BigDecimal fanliRate, BigDecimal mianDanMoney) throws HongBaoException, UserAccountException {
HongBaoV2 hongBao = new HongBaoV2();
hongBao.setUserInfo(commonOrder.getUserInfo());
hongBao.setCreateTime(new Date());
--
Gitblit v1.8.0