From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index 15fd8c8..c77bb39 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -36,11 +36,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private MsgAccountDetailService msgAccountDetailService;
-
-
@Override
public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {
@@ -73,15 +71,36 @@
return infoList.get(0);
}
+ @Override
+ public UserVIPPreInfo getProcessInfo(Long uid, Date time) {
+ List<UserVIPPreInfo> infoList = userVIPPreInfoMapper.listByUid(uid);
+ if (infoList == null || infoList.size() == 0)
+ return null;
+ Comparator<UserVIPPreInfo> cm = new Comparator<UserVIPPreInfo>() {
+
+ @Override
+ public int compare(UserVIPPreInfo o1, UserVIPPreInfo o2) {
+ return o2.getProcess() - o1.getProcess();
+ }
+ };
+ Collections.sort(infoList, cm);
+
+ for (UserVIPPreInfo info : infoList) {
+ if (time.getTime() >= info.getCreateTime().getTime())
+ return info;
+ }
+ return null;
+ }
+
@RequestSerializableByKeyService(key = "#uid")
@Transactional(rollbackFor = Exception.class)
@Override
public void verifyVipPreInfo(Long uid, boolean inviteSuccess) {
if (uid == null || uid <= 0)
return;
-
+
verifyCondition(uid);
-
+
// 楠岃瘉涓婄骇
if (inviteSuccess) {
UserInfo boss = threeSaleSerivce.getBoss(uid);
@@ -108,7 +127,7 @@
}
// 閭�璇疯鍗�
- long countZiGou =hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
+ long countZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
HongBaoV2.TYPE_ZIGOU);
// 閭�璇疯鍗�
long countShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
@@ -144,15 +163,15 @@
String msg = "";
if (countZiGou >= Constant.VIP_PROCESS_1_ZIGOU) {
process = true;
- msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_1_ZIGOU +"绗�";
+ msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_1_ZIGOU + "绗�";
} else if (countShare >= Constant.VIP_PROCESS_1_SHARE) {
process = true;
- msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_1_SHARE +"绗�";
+ msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_1_SHARE + "绗�";
} else if (firstTeam >= Constant.VIP_PROCESS_1_TEAM && secondTeam >= Constant.VIP_PROCESS_1_TEAM_SECOND) {
process = true;
- msg = "鐩存帴绮変笣杈惧埌"+ Constant.VIP_PROCESS_1_TEAM +"浜猴紝闂存帴绮変笣杈惧埌 "+ Constant.VIP_PROCESS_1_TEAM_SECOND +"浜�";
+ msg = "鐩存帴绮変笣杈惧埌" + Constant.VIP_PROCESS_1_TEAM + "浜猴紝闂存帴绮変笣杈惧埌 " + Constant.VIP_PROCESS_1_TEAM_SECOND + "浜�";
}
-
+
if (process) {
try {
UserVIPPreInfo info = new UserVIPPreInfo();
@@ -161,7 +180,7 @@
info.setCreateTime(new Date());
info.setUpdateTime(new Date());
addUserVIPPreInfo(info);
-
+
// 娑堟伅
MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
msgDto.setStatus("绯荤粺宸插皢浣犵殑璐︽埛鐢卞揩鐪佽揪浜哄崌绾т负鏅�氫細鍛�");
@@ -170,7 +189,7 @@
} catch (UserVIPPreInfoException e) {
e.printStackTrace();
}
- }
+ }
return process;
}
@@ -188,15 +207,15 @@
String msg = "";
if (countZiGou >= Constant.VIP_PROCESS_2_ZIGOU) {
process = true;
- msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_2_ZIGOU +"绗�";
+ msg = "鎭枩浣狅紒杩斿埄璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_2_ZIGOU + "绗�";
} else if (countShare >= Constant.VIP_PROCESS_2_SHARE) {
process = true;
- msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 "+ Constant.VIP_PROCESS_2_SHARE +"绗�";
+ msg = "鎭枩浣狅紒鍒嗕韩璁㈠崟杈惧埌 " + Constant.VIP_PROCESS_2_SHARE + "绗�";
} else if (firstTeam >= Constant.VIP_PROCESS_2_TEAM && secondTeam >= Constant.VIP_PROCESS_2_TEAM_SECOND) {
process = true;
- msg = "鐩存帴绮変笣杈惧埌"+ Constant.VIP_PROCESS_2_TEAM +"浜猴紝闂存帴绮変笣杈惧埌 "+ Constant.VIP_PROCESS_2_TEAM_SECOND +"浜�";
+ msg = "鐩存帴绮変笣杈惧埌" + Constant.VIP_PROCESS_2_TEAM + "浜猴紝闂存帴绮変笣杈惧埌 " + Constant.VIP_PROCESS_2_TEAM_SECOND + "浜�";
}
-
+
if (process) {
try {
UserVIPPreInfo info = new UserVIPPreInfo();
@@ -205,7 +224,7 @@
info.setCreateTime(new Date());
info.setUpdateTime(new Date());
addUserVIPPreInfo(info);
-
+
// 娑堟伅
MsgAccountVipDTO msgDto = new MsgAccountVipDTO();
msgDto.setStatus("绯荤粺宸插皢浣犵殑璐︽埛鐢辨櫘閫氫細鍛樺崌绾т负楂樼骇浼氬憳");
@@ -214,7 +233,7 @@
} catch (UserVIPPreInfoException e) {
e.printStackTrace();
}
- }
+ }
return process;
}
--
Gitblit v1.8.0