From e8e2e233af733ca3ba625223e2fd2255165e6b70 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 四月 2020 16:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 55bb8dc..b8ff19b 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
@@ -23,6 +23,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.HongBaoOrder;
@@ -36,6 +37,7 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.manger.user.UserLevelManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -76,6 +78,9 @@
@Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserLevelManager userLevelManager;
/**
* 娣诲姞绾㈠寘淇℃伅
@@ -704,9 +709,11 @@
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
if (user == null)
throw new UserAccountException(1001, "鐢ㄦ埛涓嶅瓨鍦�/琚皝绂�");
- if (isVIP) {
- hongBao.setUrank(HongBaoV2.RANK_VIP);// VIP鐨勭瓑绾ц缃负100
- } else {
+ UserLevelEnum userLevel = userLevelManager.getUserLevel(commonOrder.getUserInfo().getId(),
+ commonOrder.getThirdCreateTime());
+ if (userLevel != null)
+ hongBao.setUrank(userLevel.getOrderRank());
+ else {
hongBao.setUrank(user.getRank());
}
hongBao.setOrderType(commonOrder.getSourceType());
@@ -850,8 +857,10 @@
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
if (user == null)
throw new UserAccountException(1001, "鐢ㄦ埛涓嶅瓨鍦�/琚皝绂�");
- if (isVip)
- hongBao.setUrank(HongBaoV2.RANK_VIP);
+ UserLevelEnum userLevel = userLevelManager.getUserLevel(commonOrder.getUserInfo().getId(),
+ commonOrder.getThirdCreateTime());
+ if (userLevel != null)
+ hongBao.setUrank(userLevel.getOrderRank());
else
hongBao.setUrank(user.getRank());
hongBao.setUserInfo(user);
--
Gitblit v1.8.0