From a4637ae9d71aa4a624b217ed3a1483f0e3a3a7ed Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 06 五月 2020 14:04:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java
index d989066..41975b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/SyncBeforeInfoMessageListener.java
@@ -31,6 +31,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -79,11 +80,9 @@
if (tag.equalsIgnoreCase(UserTopicTagEnum.userActve.name())) {
UserActiveMQMsg msg = new Gson().fromJson(new String(message.getBody()), UserActiveMQMsg.class);
Long uid = msg.getUid();
-
// 鑰佺敤鎴峰悓姝ョ粦瀹氫俊鎭�
+
userInfoModifyRecordService.syncBeforeInfo(uid);
-
-
// 浣庣増鏈叏閮ㄥ崌绾ф櫘閫氫細鍛�
List<ThreeSale> threeSaleList = threeSaleSerivce.getMyBossDeepList(uid, 2);
@@ -121,6 +120,7 @@
vip.setCreateTime(new Date());
vip.setProcess(UserVIPPreInfo.PROCESS_1);
vip.setUid(uid);
+ vip.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER);
try {
userVIPPreInfoService.addUserVIPPreInfo(vip);
} catch (UserVIPPreInfoException e) {
@@ -153,6 +153,7 @@
vip.setCreateTime(new Date());
vip.setProcess(UserVIPPreInfo.PROCESS_1);
vip.setUid(uid);
+ vip.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER);
try {
userVIPPreInfoService.addUserVIPPreInfo(vip);
} catch (UserVIPPreInfoException e) {
@@ -160,6 +161,14 @@
}
}
}
+ } else {//涔嬪墠鑰佺増鏈鐞嗕负鏅�氫細鍛樼殑鐢ㄦ埛鍗囩骇鏂扮増鏈�
+ if (vipInfo.getProcess() == UserVIPPreInfo.PROCESS_1
+ && vipInfo.getCreateTime().getTime() < TimeUtil
+ .convertToTimeTemp("2020-04-30 14:10:00", "yyyy-MM-dd HH:mm:ss")) {
+ // 璁＄畻绛夌骇
+ userVIPPreInfoService.upgradeVipByMyOrder(uid);
+ userVIPPreInfoService.upgradeVipByTeamNum(uid);
+ }
}
}
}
--
Gitblit v1.8.0