From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index 0416440..ab38acd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -5,12 +5,14 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
@@ -21,6 +23,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
@@ -29,11 +32,14 @@
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.wx.WXLoginUtil;
@@ -46,7 +52,7 @@
@Resource
private RedisManager redisManager;
-
+
@Resource
private ConfigService configService;
@@ -67,6 +73,12 @@
@Resource
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
+
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserInviteSeparateService userInviteSeparateService;
/**
* 閭�璇风爜楠岃瘉
@@ -100,17 +112,17 @@
WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());
if (weiXinUser == null)
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
-
+
String wxUnionId = weiXinUser.getUnionid();
if (wxUnionId == null || wxUnionId.trim().length() == 0)
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
-
+
String activeWX = StringUtil.Md5("activeWX:" + weiXinUser.getUnionid());
redisManager.cacheCommonString(activeWX, JsonUtil.getSimpleGson().toJson(weiXinUser), 60 * 20);
-
+
// 閭�璇峰叧绯荤敤鎴蜂俊鎭�
UserInfo userInfo = userInfoExtraService.getInviterInfo(uid, wxUnionId);
-
+
JSONObject data = new JSONObject();
data.put("nickName", userInfo.getNickName());
data.put("portrait", userInfo.getPortrait());
@@ -124,9 +136,11 @@
/**
* 寰俊婵�娲�
+ *
* @param acceptData
* @param uid
- * @param key 楠岃瘉杩斿洖鐨刱ey
+ * @param key
+ * 楠岃瘉杩斿洖鐨刱ey
* @param out
*/
@RequestSerializableByKey(key = "'activeInviteWX-'+#uid")
@@ -136,15 +150,15 @@
String value = redisManager.getCommonString(key);
if (StringUtil.isNullOrEmpty(value))
throw new UserAccountException(1, "寰俊鎺堟潈澶辨晥");
-
+
WeiXinUser weiXinUser = JsonUtil.getSimpleGson().fromJson(value, WeiXinUser.class);
if (weiXinUser == null)
throw new UserAccountException(1, "寰俊鎺堟潈澶辨晥");
-
+
userInfoExtraService.activeInviteWX(uid, weiXinUser);
// 鍒犻櫎缂撳瓨
redisManager.removeCommonString(key);
-
+
out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -153,9 +167,7 @@
e.printStackTrace();
}
}
-
-
-
+
/**
* 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.5.3鏌ヨ鏈夋晥闃熷憳
*
@@ -180,8 +192,12 @@
count = threeSaleSerivce.countSecondTeam(uid, 1);
}
+ boolean needVIPInfo = false;
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()))
+ needVIPInfo = true;
+
// 缁勭粐鏁版嵁
- JSONObject resultData = organizeTeam(count, listTeam, uid, type);
+ JSONObject resultData = organizeTeam(count, listTeam, uid, type,needVIPInfo);
// 绗竴椤靛垽鏂槸鍚︽縺娲� 鏄惁鏈夐槦鍛�
if (type == 1 && page == 1) {
@@ -206,7 +222,7 @@
* @param type
* @return
*/
- private JSONObject organizeTeam(long count, List<ThreeSale> list, Long uid, int type) {
+ private JSONObject organizeTeam(long count, List<ThreeSale> list, Long uid, int type, boolean needVipInfo) {
JSONObject result = new JSONObject();
JSONArray resultArray = new JSONArray();
@@ -215,6 +231,14 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
SimpleDateFormat formatYears = new SimpleDateFormat("yyyy");
+ List<Long> workerIdList = new ArrayList<>();
+ Map<Long, Boolean> vipMap = null;
+ if (needVipInfo) {
+ for (ThreeSale threeSale : list)
+ workerIdList.add(threeSale.getWorker().getId());
+ if (workerIdList.size() > 0)
+ vipMap = userVIPInfoService.listByUids(workerIdList);
+ }
for (ThreeSale threeSale : list) {
UserInfo worker = threeSale.getWorker();
if (worker == null) {
@@ -230,7 +254,39 @@
Date inviteTime = new Date(threeSale.getCreateTime());
object.put("inviteTime", format.format(inviteTime) + " 鍔犲叆");
+ // 娣诲姞鏄惁涓篤IP
+ if (vipMap != null && vipMap.get(worker.getId()) != null) {
+ object.put("vip", vipMap.get(worker.getId()));
+ if (vipMap.get(worker.getId())) {
+ UserInviteSeparate separate = userInviteSeparateService.selectByWorkerIdAndBossId(worker.getId(), uid);
+ if (separate != null && separate.getEndTime() != null) {
+ try {
+
+
+ JSONObject contentJson1 = new JSONObject();
+ contentJson1.put("color", "#888888");
+ contentJson1.put("content", "灏嗕簬");
+ JSONObject contentJson2 = new JSONObject();
+ contentJson2.put("color", "#F14242");
+ contentJson2.put("content", DateUtil.dateDiff4(new Date(), separate.getEndTime()));
+
+ JSONObject contentJson3 = new JSONObject();
+ contentJson3.put("color", "#888888");
+ contentJson3.put("content", "鍚庤劚绂婚個璇峰叧绯�");
+
+ JSONArray array = new JSONArray();
+ array.add(contentJson1);
+ array.add(contentJson2);
+ array.add(contentJson3);
+ object.put("vipBreakTime",array);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
String fontColor1 = "#888888";
JSONArray array = new JSONArray();
if (threeSale.getState()) {
--
Gitblit v1.8.0