From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 558 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 475 insertions(+), 83 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 d0b4dcc..ad66192 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,14 +5,18 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.dto.vip.UserVIPLevel;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;
@@ -20,51 +24,95 @@
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.UserInviteValidNum;
+import com.yeshi.fanli.entity.bus.user.UserInviteValidRecord;
+import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.entity.system.SystemClientParams;
+import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.config.SpreadImgService;
+import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+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.invite.UserInviteService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidRecordService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisKeyEnum;
+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.user.UserLevelUtil;
+import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-
@Controller
@RequestMapping("api/v2/invite")
public class InviteControllerV2 {
@Resource
+ private RedisManager redisManager;
+
+ @Resource
private ConfigService configService;
-
+
@Resource
private PushService pushService;
@Resource
private UserSystemMsgService userSystemMsgService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private UserInfoService userInfoService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private SpreadImgService spreadImgService;
+ @Resource
+ private SpreadUserImgService spreadUserImgService;
+
+ @Resource
+ private SystemClientParamsService systemClientParamsService;
+
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource
+ private UserInviteValidRecordService userInviteValidRecordService;
+
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
/**
* 閭�璇风爜楠岃瘉
+ *
* @param out
*/
@RequestMapping(value = "verifyCode")
@@ -74,32 +122,82 @@
JSONObject data = new JSONObject();
data.put("nickName", userInfo.getNickName());
data.put("portrait", userInfo.getPortrait());
- data.put("tips", "纭瑕佹垚涓篢A鐨勪竴绾ч槦鍛樺悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
+ data.put("tips", "纭瑕佹垚涓篢A鐨勭洿鎺ョ矇涓濆悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
out.print(JsonUtil.loadTrueResult(data));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
}
}
-
-
+
/**
- * 閭�璇风爜寰俊
+ * 閭�璇风爜寰俊楠岃瘉
+ *
* @param out
*/
@RequestMapping(value = "verifyWX")
public void verifyWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {
try {
- UserInfo userInfo = userInfoExtraService.getInviterInfo(uid, code);
+ WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
+ // 鑾峰彇寰俊淇℃伅
+ 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 key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5("activeWX:" + weiXinUser.getUnionid()));
+ redisManager.cacheCommonString(key, 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());
- data.put("tips", "纭瑕佹垚涓篢A鐨勪竴绾ч槦鍛樺悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
+ data.put("tips", "纭瑕佹垚涓篢A鐨勭洿鎺ョ矇涓濆悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
+ data.put("key", key);
out.print(JsonUtil.loadTrueResult(data));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
}
}
-
+
+ /**
+ * 寰俊婵�娲�
+ *
+ * @param acceptData
+ * @param uid
+ * @param key
+ * 楠岃瘉杩斿洖鐨刱ey
+ * @param out
+ */
+ @RequestSerializableByKey(key = "'activeInviteWX-'+#uid")
+ @RequestMapping(value = "activeInviteWX")
+ public void activeInviteWX(AcceptData acceptData, Long uid, String key, PrintWriter out) {
+ try {
+ 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()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("閭�璇风爜婵�娲诲け璐�"));
+ e.printStackTrace();
+ }
+ }
+
/**
* 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.5.3鏌ヨ鏈夋晥闃熷憳
*
@@ -110,23 +208,32 @@
@RequestMapping(value = "getMyTeam", method = RequestMethod.POST)
public void getMyTeam(AcceptData acceptData, long page, long uid, int type, PrintWriter out) {
if (type != 1 && type != 2) {
- out.print(JsonUtil.loadFalseResult("闃熷憳绫诲瀷涓嶆纭�"));
+ out.print(JsonUtil.loadFalseResult("绮変笣绫诲瀷涓嶆纭�"));
+ return;
+ }
+
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ getMyTeamNew(acceptData, page, uid, type, out);
return;
}
long count = 0;
List<ThreeSale> listTeam = null;
if (type == 1) {
- listTeam = threeSaleSerivce.listFirstTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, 1);
- count = threeSaleSerivce.countFirstTeam(uid, 1);
+ listTeam = threeSaleSerivce.listFirstTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+ count = threeSaleSerivce.countFirstTeam(uid);
} else if (type == 2) {
- listTeam = threeSaleSerivce.listSecondTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, 1);
- count = threeSaleSerivce.countSecondTeam(uid, 1);
+ listTeam = threeSaleSerivce.listSecondTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+ count = threeSaleSerivce.countSecondTeam(uid);
}
-
+
+ boolean needVIPInfo = false;
+ if (VersionUtil.greaterThan_2_0_5(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) {
boolean hasCode = false;
@@ -136,46 +243,56 @@
hasCode = true;
}
resultData.put("hasCode", hasCode);
- resultData.put("hasTeam", count > 0? true:false);
+ resultData.put("hasTeam", count > 0 ? true : false);
}
out.print(JsonUtil.loadTrueResult(resultData));
}
-
-
-
+
/**
* 缁勭粐鏁版嵁
+ *
* @param count
* @param list
* @param uid
* @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();
-
+
Date todayTime = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("MM.dd HH:mm");
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) {
continue;
}
Long workerId = worker.getId();
-
+
JSONObject object = new JSONObject();
object.put("workerId", worker.getId());
object.put("nickName", worker.getNickName());
object.put("portrait", worker.getPortrait());
object.put("inviteId", threeSale.getId());
-
+
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()));
+ }
String fontColor1 = "#888888";
JSONArray array = new JSONArray();
if (threeSale.getState()) {
@@ -194,9 +311,9 @@
contentJson.put("content", "鏈�杩戠櫥褰� " + format.format(lastLoginTime));
}
array.add(contentJson);
-
+
// 涓�绾ч槦鍛� 鏌ヨ
- if(type == 1) {
+ if (type == 1) {
String memoName = null;
ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
if (threeSaleExtraInfo != null) {
@@ -205,7 +322,7 @@
}
}
object.put("memoName", memoName);
-
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(workerId);
if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {
object.put("weiXin", userInfoExtra.getWeiXin());
@@ -214,14 +331,14 @@
} else {
if (!threeSaleExtraInfoSerivce.isRemindWorker(uid, workerId)) {
object.put("weiXinState", 1);
- object.put("weiXinTip", "鐐瑰嚮鎻愰啋TA锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
+ object.put("weiXinTip", "鐐瑰嚮鎻愰啋锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
} else {
object.put("weiXinState", 2);
object.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
}
}
}
- }
+ }
object.put("state", 1);
object.put("recentMsg", array);
resultArray.add(object);
@@ -233,6 +350,185 @@
}
+ private void getMyTeamNew(AcceptData acceptData, long page, long uid, int type, PrintWriter out) {
+ if (type != 1 && type != 2) {
+ out.print(JsonUtil.loadFalseResult("绮変笣绫诲瀷涓嶆纭�"));
+ return;
+ }
+
+ long count = 0;
+ List<ThreeSale> listTeam = null;
+ if (type == 1) {
+ listTeam = threeSaleSerivce.listFirstTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+ count = threeSaleSerivce.countFirstTeam(uid);
+ } else if (type == 2) {
+ listTeam = threeSaleSerivce.listSecondTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);
+ count = threeSaleSerivce.countSecondTeam(uid);
+ }
+
+ JSONObject result = new JSONObject();
+ result.put("count", count);
+ result.put("list", organizeTeamNew(count, listTeam, uid, type, true));
+
+ // 绗竴椤靛垽鏂槸鍚︽縺娲� 鏄惁鏈夐槦鍛�
+ if (type == 1 && page == 1) {
+ boolean hasCode = false;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
+ hasCode = true;
+ }
+ result.put("hasCode", hasCode);
+ result.put("hasTeam", count > 0 ? true : false);
+ }
+ out.print(JsonUtil.loadTrueResult(result));
+ }
+
+ /**
+ * 鍔犲伐鏁版嵁
+ * @param count
+ * @param list
+ * @param uid
+ * @param type 鏌ヨ绮変笣绫诲瀷 1鐩存帴 2闂存帴
+ * @param wxtip 鏄渶瑕佸井淇℃彁绀�
+ * @return
+ */
+ private JSONArray organizeTeamNew(long count, List<ThreeSale> list, Long uid, int type, boolean wxtip) {
+ JSONArray resultArray = new JSONArray();
+ if (list == null || list.size() == 0) {
+ return resultArray;
+ }
+
+ Date todayTime = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("MM.dd HH:mm");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ SimpleDateFormat formatYears = new SimpleDateFormat("yyyy");
+
+ List<Long> listWid = new ArrayList<>();
+ for (ThreeSale threeSale : list) {
+ listWid.add(threeSale.getWorker().getId());
+ }
+
+ // 鏌ヨ鏈夋晥绮変笣id
+ int validType = UserInviteValidRecord.TYPE_TWO;
+ if (type == 1) {
+ validType = UserInviteValidRecord.TYPE_ONE;
+ }
+
+ List<Long> listVid = userInviteValidRecordService.getValidWorkerIdsByUid(uid, listWid, validType);
+
+ for (ThreeSale threeSale : list) {
+ UserInfo worker = threeSale.getWorker();
+ Long workerId = worker.getId();
+
+ // 閭�璇锋垚鍔熸椂闂�
+ Long succeedTime = threeSale.getSucceedTime();
+ if (succeedTime == null) {
+ succeedTime = threeSale.getCreateTime();
+ }
+
+ // 鏈夋晥绮変笣
+ boolean validFans = false;
+ if (listVid != null && listVid.size() > 0 && listVid.contains(workerId)) {
+ validFans = true;
+ }
+
+ // 鏈�杩戠矇涓濈櫥褰曟椂闂�
+ Date lastLoginTime = new Date(threeSale.getCreateTime());
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(workerId);
+ if (userInfoExtra != null && userInfoExtra.getActiveTime() != null) {
+ lastLoginTime = userInfoExtra.getActiveTime();
+ }
+ JSONObject loginJson = new JSONObject();
+ if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {
+ loginJson.put("content", "鏈�杩戠櫥褰� " + sdf.format(lastLoginTime)); // 鏈勾
+ } else {
+ loginJson.put("content", "鏈�杩戠櫥褰� " + format.format(lastLoginTime)); // 寰�骞�
+ }
+ loginJson.put("color", "#888888");
+
+ JSONArray array = new JSONArray();
+ array.add(loginJson);
+
+ // 鏌ヨ绮変笣绛夌骇
+ UserLevelEnum level = null;
+ UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(workerId);
+ if (vipLevel != null && vipLevel.getLevel() != null) {
+ level = UserLevelUtil.getByLevel(vipLevel.getLevel());
+ }
+ if(level == null) {
+ level = UserLevelEnum.daRen;
+ }
+ level = UserLevelUtil.getShowLevel(level);
+
+ JSONObject object = new JSONObject();
+ object.put("workerId", workerId);
+ object.put("nickName", worker.getNickName());
+ object.put("portrait", worker.getPortrait());
+ object.put("inviteId", threeSale.getId());
+ object.put("inviteTime", format.format(new Date(succeedTime)) + " 鍔犲叆");
+ object.put("state", 1);
+ object.put("recentMsg", array);
+ object.put("level", level.name());
+ object.put("validFans", validFans);
+
+ if (wxtip && type == 1 && threeSale.getState() != null && threeSale.getState()) {
+ // 涓�绾ч槦鍛� 鏌ヨ鏄电О澶囨敞
+ String memoName = null;
+ ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();
+ if (threeSaleExtraInfo != null) {
+ if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
+ memoName = threeSaleExtraInfo.getNickname();
+ }
+ }
+ object.put("memoName", memoName);
+
+ // 娣诲姞寰俊淇℃伅
+ if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {
+ object.put("weiXin", userInfoExtra.getWeiXin());
+ object.put("weiXinState", 3);
+ object.put("weiXinTip", "娣诲姞TA鐨勫井淇★紝浣犲彲鏁欐巿TA濡備綍閫氳繃鏉挎牀蹇渷璧氶挶鎶�宸с��");
+ } else {
+ if (!threeSaleExtraInfoSerivce.isRemindWorker(uid, workerId)) {
+ object.put("weiXinState", 1);
+ object.put("weiXinTip", "鐐瑰嚮鎻愰啋锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
+ } else {
+ object.put("weiXinState", 2);
+ object.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
+ }
+ }
+ }
+ resultArray.add(object);
+ }
+ return resultArray;
+ }
+
+
+ /**
+ * 鏌ョ湅涓嬬骇鐨勭洿鎺ョ矇涓�
+ * @param acceptData
+ * @param page
+ * @param uid 褰撳墠UId
+ * @param tid 涓嬬骇UId
+ * @param out
+ */
+ @RequestMapping(value = "getOthersTeam", method = RequestMethod.POST)
+ public void getOthersTeam(AcceptData acceptData, long page, Long uid, Long tid, PrintWriter out) {
+ if (tid == null) {
+ out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
+ return;
+ }
+
+ List<ThreeSale> listTeam = threeSaleSerivce.listFirstTeam((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, tid);
+ long count = threeSaleSerivce.countFirstTeam(tid);
+
+ JSONObject result = new JSONObject();
+ result.put("count", count);
+ result.put("list", organizeTeamNew(count, listTeam, tid, 1, false));
+ out.print(JsonUtil.loadTrueResult(result));
+ }
+
+
/**
* 鐢ㄦ埛闃熷憳缁熻- IOS
*
@@ -242,66 +538,85 @@
*/
@RequestMapping(value = "countMyTeam", method = RequestMethod.POST)
public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
- JSONObject bossData = getBossInfo(acceptData, uid, threeSaleSerivce.getMyBoss(uid));
+ JSONObject bossData = getBossInfo(uid, threeSaleSerivce.getMyBoss(uid));
JSONObject resultData = new JSONObject();
-
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid);
+ long countSecond = threeSaleSerivce.countSecondTeam(uid);
resultData.put("boss", bossData);
- resultData.put("helpLink", configService.get("team_help_url"));
resultData.put("firstTeam", firstTeam);
- resultData.put("firstTeamTotal", threeSaleSerivce.countFirstTeam(uid, null));
- resultData.put("secondTeam", threeSaleSerivce.countSecondTeam(uid, 1));
- resultData.put("secondTeamTotal", threeSaleSerivce.countSecondTeam(uid, null));
-
+ resultData.put("firstTeamTotal", firstTeam);
+ resultData.put("secondTeam", countSecond);
+ resultData.put("secondTeamTotal", countSecond);
+ resultData.put("helpLink", configService.get(ConfigKeyEnum.teamHelpUrl.getKey()));
+
boolean hasTeam = true;
if (firstTeam <= 0) {
hasTeam = false;
- resultData.put("invitelink", configService.get("invite_activation_url"));
+ resultData.put("invitelink", configService.get(ConfigKeyEnum.inviteActivationUrl.getKey()));
}
resultData.put("hasTeam", hasTeam);
-
+
boolean hasCode = false;
boolean bdWeiXin = false;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null) {
if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
hasCode = true;
-
+
if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin()))
bdWeiXin = true;
}
-
+
// 鏈縺娲婚個璇风爜
resultData.put("hasCode", hasCode);
if (!hasCode) {
List<String> tipCode = new ArrayList<String>();
- resultData.put("helpLinkActivate", configService.get("team_help_url"));
- tipCode.add("婵�娲婚個璇峰姛鑳藉悗鎵嶅彲浠ラ個璇烽槦鍛橈紝涓�绾ч槦鍛樻槸鐢变綘鐩存帴閭�璇凤紝浜岀骇闃熷憳鏄敱浣犵殑涓�绾ч槦鍛橀個璇枫��");
+ resultData.put("helpLinkActivate", configService.get(ConfigKeyEnum.teamHelpUrl.getKey()));
+ tipCode.add("婵�娲婚個璇峰姛鑳藉悗鎵嶅彲浠ラ個璇风矇涓濓紝鐩存帴绮変笣鏄敱浣犵洿鎺ラ個璇凤紝闂存帴绮変笣鏄敱浣犵殑鐩存帴绮変笣閭�璇枫��");
tipCode.add("閭�璇锋縺娲诲姛鑳斤紝蹇呴』瑕佹湁閭�璇风爜锛岄個璇风爜鍙互閫氳繃閲戝竵鍏戞崲锛屼篃鍙互鍏ㄧ綉鎼滅储銆�");
resultData.put("tipCode", tipCode);
}
-
+
// 鏈坊鍔犲井淇″彿
List<String> tipWeiXin = new ArrayList<String>();
if (!bdWeiXin) {
- tipWeiXin.add("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲閫氳繃寰俊鍙蜂笌浣犲缓绔嬭仈绯伙紱");
- tipWeiXin.add("浣犱篃鍙互鍚戦個璇蜂汉瀛︿範鎴栧悜涓�绾ч槦鍛樻暀鎺堣禋閽辨妧宸с��");
+ tipWeiXin.add("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲閫氳繃寰俊鍙蜂笌浣犲缓绔嬭仈绯伙紱");
+ tipWeiXin.add("浣犱篃鍙互鍚戦個璇蜂汉瀛︿範鎴栧悜鐩存帴绮変笣鏁欐巿璧氶挶鎶�宸с��");
}
resultData.put("tipWeiXin", tipWeiXin);
- resultData.put("tipWeiXinAdd", "娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
+ resultData.put("tipWeiXinAdd", "娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
resultData.put("bdWeiXin", bdWeiXin);
-
+
out.print(JsonUtil.loadTrueResult(resultData));
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getBossInfo", method = RequestMethod.POST)
+ public void getBossInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+ JSONObject bossData = getBossInfo(uid, threeSaleSerivce.getMyBoss(uid));
+ out.print(JsonUtil.loadTrueResult(bossData));
+ }
+
/**
* 涓婄骇淇℃伅缁勭粐
+ *
* @param acceptData
* @param uid
* @param threeSale
* @return
*/
- private JSONObject getBossInfo(AcceptData acceptData, long uid, ThreeSale threeSale) {
+ private JSONObject getBossInfo(long uid, ThreeSale threeSale) {
JSONObject bossData = new JSONObject();
if (threeSale != null && threeSale.getBoss() != null) {
UserInfo boss = threeSale.getBoss();
@@ -312,7 +627,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
Long createTime = threeSale.getCreateTime();
Date inviteTime = new Date(createTime);
-
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(boss.getId());
if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) {
bossData.put("weiXin", userInfoExtra.getWeiXin());
@@ -321,7 +636,7 @@
} else {
if (!threeSaleExtraInfoSerivce.isRemindBoss(boss.getId(), uid)) {
bossData.put("weiXinState", 1);
- bossData.put("weiXinTip", "鐐瑰嚮鎻愰啋TA锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
+ bossData.put("weiXinTip", "鐐瑰嚮鎻愰啋锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
} else {
bossData.put("weiXinState", 2);
bossData.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
@@ -330,16 +645,15 @@
bossData.put("inviteTime", "浣犱簬 " + sdf.format(inviteTime) + "鎺ュ彈浜員A鐨勯個璇�");
} else {
bossData.put("hasBoss", false);
- bossData.put("helpLink", configService.get("invite_code_hlep_link"));
- bossData.put("weiXinTip", "鎭枩浣狅紝鎴戜滑鐨勪紭璐ㄧ敤鎴凤紱\r\n浣犲苟娌℃湁閭�璇蜂汉锛屼絾浣犵殑閭�璇锋縺娲诲姛鑳芥槸琚粯璁ゅ紑鍚殑锛沑r\n浣犳嫢鏈夌嫭鐗圭殑鏃犻個璇蜂汉婵�娲荤爜銆�");
+ bossData.put("helpLink", configService.get(ConfigKeyEnum.inviteCodeHlepLink.getKey()));
+ bossData.put("weiXinTip", "鎭枩浣狅紝鎴戜滑鐨勪紭璐ㄧ敤鎴凤紱\r\n浣犲苟娌℃湁閭�璇蜂汉锛屼絾浣犵殑閭�璇锋縺娲诲姛鑳芥槸琚粯璁ゅ紑鍚殑锛沑r\n浣犳嫢鏈夌嫭鐗圭殑鏃犻個璇蜂汉婵�娲荤爜銆�");
}
return bossData;
- }
-
-
-
+ }
+
/**
* 绔欏唴淇℃彁閱掗槦鍛樻坊鍔犲井淇″彿
+ *
* @param acceptData
* @param uid
* @param inviteId
@@ -351,19 +665,19 @@
out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁扮己澶�"));
return;
}
-
+
UserInfo userInfo = userInfoService.selectByPKey(uid);
if (userInfo == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛淇℃伅涓嶅瓨鍦�"));
return;
}
-
+
ThreeSale threeSale = threeSaleSerivce.selectByPrimaryKey(inviteId);
if (threeSale == null) {
out.print(JsonUtil.loadFalseResult("鍏崇郴id涓嶅瓨鍦�"));
return;
- }
-
+ }
+
Long remindId = null;
boolean remindBoss = true;
if (uid.longValue() == threeSale.getWorker().getId().longValue()) {
@@ -371,44 +685,46 @@
} else if (uid.longValue() == threeSale.getBoss().getId().longValue()) {
remindBoss = false;
remindId = threeSale.getWorker().getId(); // 鎻愰啋涓嬬骇
- }
-
+ }
+
if (remindId == null) {
out.print(JsonUtil.loadFalseResult("淇℃伅楠岃瘉鏈�氳繃"));
return;
}
-
+
Long bossId = null;
Long workerId = null;
- String title = "闃熷憳鎻愰啋娑堟伅";
+ String title = "绮変笣鎻愰啋娑堟伅";
String content = "";
if (remindBoss) {
// 鎻愮ず闃熼暱
bossId = remindId;
workerId = uid;
- content = "浣犵殑涓�绾ч槦鍛�"+ userInfo.getNickName() +"锛屾彁閱掍綘娣诲姞寰俊鍙凤紝浠ヤ究浜庡拰浣犲彇寰楄仈绯诲拰瀛︿範鐪侀挶鎶�宸э紝璧跺揩鍘绘坊鍔犲惂锛涙敞锛氳鍗囩骇鍒版湰杞欢鏈�鏂扮増鏈湪鈥滄垜鐨�-鎴戠殑淇℃伅鈥濅腑娣诲姞銆�";
+ content = "浣犵殑鐩存帴绮変笣" + userInfo.getNickName()
+ + "锛屾彁閱掍綘娣诲姞寰俊鍙凤紝浠ヤ究浜庡拰浣犲彇寰楄仈绯诲拰瀛︿範鐪侀挶鎶�宸э紝璧跺揩鍘绘坊鍔犲惂锛涙敞锛氳鍗囩骇鍒版湰杞欢鏈�鏂扮増鏈湪鈥滄垜鐨�-鎴戠殑淇℃伅鈥濅腑娣诲姞銆�";
} else {
// 鎻愮ず闃熷憳
bossId = uid;
workerId = remindId;
- content = "浣犵殑閭�璇蜂汉"+ userInfo.getNickName() +"锛屾彁閱掍綘娣诲姞寰俊鍙凤紝浠ヤ究浜庡拰浣犲彇寰楄仈绯诲府鍔╀綘鏇村ソ鐨勭渷閽憋紝璧跺揩鍘绘坊鍔犲惂锛涙敞锛氳鍗囩骇鍒版湰杞欢鏈�鏂扮増鏈湪鈥滄垜鐨�-鎴戠殑淇℃伅鈥濅腑娣诲姞銆�";
+ content = "浣犵殑閭�璇蜂汉" + userInfo.getNickName()
+ + "锛屾彁閱掍綘娣诲姞寰俊鍙凤紝浠ヤ究浜庡拰浣犲彇寰楄仈绯诲府鍔╀綘鏇村ソ鐨勭渷閽憋紝璧跺揩鍘绘坊鍔犲惂锛涙敞锛氳鍗囩骇鍒版湰杞欢鏈�鏂扮増鏈湪鈥滄垜鐨�-鎴戠殑淇℃伅鈥濅腑娣诲姞銆�";
}
-
+
try {
List<String> listIOS = new ArrayList<String>();
List<String> listAndroid = new ArrayList<String>();
pushService.pushZNX(remindId, title, content, listIOS, listAndroid);
-
- userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common,
- title, content, UserSystemMsg.TIME_TAG_COMMON, null);
-
+
+ userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common, title, content,
+ UserSystemMsg.TIME_TAG_COMMON, null);
+
ThreeSaleExtraInfo newInfo = new ThreeSaleExtraInfo();
if (remindBoss) {
newInfo.setRemindBoss(1);
} else {
newInfo.setRemindWorker(1);
}
-
+
ThreeSaleExtraInfo threeExtra = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(bossId, workerId);
if (threeExtra != null) {
newInfo.setId(threeExtra.getId());
@@ -421,7 +737,7 @@
newInfo.setUpdateTime(new Date());
threeSaleExtraInfoSerivce.insertSelective(newInfo);
}
-
+
JSONObject data = new JSONObject();
data.put("weiXinState", 2);
data.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
@@ -431,4 +747,80 @@
out.print(JsonUtil.loadFalseResult("鎻愰啋澶辫触"));
}
}
+
+
+ @RequestSerializableByKey(key = "'getInviteImgs-'+#uid")
+ @RequestMapping(value = "/getInviteImgs", method = RequestMethod.POST)
+ public void getInviteImgs(AcceptData acceptData, Long uid, Integer page, PrintWriter out, HttpServletRequest request) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ if (page == null || page < 1)
+ page = 1;
+
+ try {
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+ if (StringUtil.isNullOrEmpty(inviteCode)) {
+ out.print(JsonUtil.loadFalseResult("閭�璇风爜鏈縺娲�"));
+ return;
+ }
+
+ int count = 3;
+ if (page > 1)
+ count = Integer.MAX_VALUE;
+
+ // 閭�璇峰浘
+ List<String> imgList = spreadUserImgService.getUserSpreadImgToPage(uid, page, count, request);
+
+ // 閭�璇疯鍒�
+ BusinessSystem system = new BusinessSystem();
+ system.setId(4L);
+ system.setPlatform(1);
+ system.setCreatetime(java.lang.System.currentTimeMillis());
+ SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, "inviteRules");
+
+ JSONObject data = new JSONObject();
+ data.put("count", spreadImgService.countAll());
+ data.put("inviteCode", inviteCode);
+ data.put("helpLink", configService.get(ConfigKeyEnum.inviteHelpLink.getKey()));
+ data.put("inviteRules", values.getValue().replace("\n", "<br><br>"));
+ data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList));
+ data.put("inviteLink", Constant.YINGYONGBAO_LINK);
+ out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ out.print(JsonUtil.loadFalseResult("閭�璇蜂俊鎭幏鍙栧け璐�"));
+ }
+ }
+
+ /**
+ * 绔欏唴淇℃彁閱掗槦鍛樻坊鍔犲井淇″彿
+ *
+ * @param acceptData
+ * @param uid
+ * @param inviteId
+ * @param out
+ */
+ @RequestMapping(value = "tailorCode")
+ public void tailorCode(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛id缂哄け"));
+ return;
+ }
+
+ // 鏈夋晥绮変笣
+ int doneFirst = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("num", doneFirst);
+ data.put("limit", Constant.INVITE_CODRE_TAILOR_LIMIT);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0