From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
index 5227136..24e850e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPInfoServiceImpl.java
@@ -23,7 +23,6 @@
import com.yeshi.fanli.entity.bus.user.vip.UserLevelUpgradedNotify;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
-import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
@@ -162,7 +161,8 @@
throw new UserVIPInfoException(1, "璇峰厛鍗囩骇涓洪珮绾т細鍛�");
}
- if (!verifyVip(uid))
+ int verifyResult = verifyVip(uid);
+ if (verifyResult <= 0)
throw new UserVIPInfoException(1, "涓嶆弧瓒冲崌绾ф潯浠�");
UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);
@@ -215,7 +215,9 @@
throw new UserVIPInfoException(1, "璇ョ敤鎴疯繕涓嶆槸楂樼骇浼氬憳");
}
- if (!verifyVip(uid))
+ int verifyVipResult = verifyVip(uid);
+
+ if (verifyVipResult <= 0)
throw new UserVIPInfoException(1, "绯荤粺楠岃瘉锛氫笉婊¤冻鍗囩骇鏉′欢");
Date upgradeTime = new Date();
@@ -230,6 +232,7 @@
UserVIPPreInfo preInfo = new UserVIPPreInfo();
preInfo.setCreateTime(new Date());
preInfo.setProcess(UserLevelEnum.superVIP.getLevel());
+ preInfo.setSourceType(verifyVipResult);
preInfo.setUid(uid);
try {
@@ -263,13 +266,6 @@
}
} catch (Exception e) {
e.printStackTrace();
- }
-
- if (!Constant.IS_TEST) {
- UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, UserLevelEnum.highVIP, UserLevelEnum.superVIP,
- new Date());
- Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);
- producer.send(message);
}
}
@@ -318,11 +314,15 @@
}
/**
- * 楠岃瘉鏄惁绗﹀悎VIP
+ * 楠岃瘉鏄惁绗﹀悎VIP
+ * @Title: verifyVip
+ * @Description:
* @param uid
- * @return
+ * @return 0-涓嶇鍚� 1-璁㈠崟 2-鍥㈤槦
+ * int 杩斿洖绫诲瀷
+ * @throws
*/
- private boolean verifyVip(Long uid) {
+ private int verifyVip(Long uid) {
// 鑷喘 + 鍒嗕韩璁㈠崟
long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);
// 鏈夋晥绮変笣
@@ -351,10 +351,14 @@
limitSecond = Long.parseLong(second);
}
- if (doneOrder >= limitOrder || (doneFirst >= limitFirst && doneSecond >= limitSecond)) {
- return true;
+ if (doneOrder >= limitOrder) {
+ return UserVIPPreInfo.SOURCE_TYPE_ORDER;
}
- return false;
+
+ if ((doneFirst >= limitFirst && doneSecond >= limitSecond))
+
+ return UserVIPPreInfo.SOURCE_TYPE_TEAM;
+ return 0;
}
@Transactional(rollbackFor = Exception.class)
--
Gitblit v1.8.0