From 4ecb8ab87dd98bdbce6b4d591051de5d088cf907 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 17 二月 2020 10:12:24 +0800
Subject: [PATCH] Merge branch 'div-new' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java | 121 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java
index b78f308..1ab8e0a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/InviteController.java
@@ -16,7 +16,8 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dto.WXMPAcceptData;
-import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
+import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -24,14 +25,16 @@
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
+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.StringUtil;
-import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -57,6 +60,15 @@
@Resource
private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
+
+ @Resource
+ private UserInfoService userInfoService;
+
+ @Resource
+ private PushService pushService;
+
+ @Resource
+ private UserSystemMsgService userSystemMsgService;
/**
* 涓撳睘閭�璇风爜鏉′欢
@@ -169,7 +181,7 @@
* @param id
* @param out
*/
- @RequestMapping(value = "listMyTeam", method = RequestMethod.POST)
+ @RequestMapping(value = "listMyTeam")
public void listMyTeam(WXMPAcceptData acceptData, int page, long uid, int type, PrintWriter out) {
if (type != 1 && type != 2) {
out.print(JsonUtil.loadFalseResult("绮変笣绫诲瀷涓嶆纭�"));
@@ -186,9 +198,7 @@
count = threeSaleSerivce.countSecondTeam(uid, 1);
}
- boolean needVIPInfo = false;
- if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
- needVIPInfo = true;
+ boolean needVIPInfo = true;
// 缁勭粐鏁版嵁
JSONObject resultData = organizeTeam(count, listTeam, uid, type, needVIPInfo);
@@ -344,7 +354,7 @@
* @param out
*/
@RequestMapping(value = "getBossInfo", method = RequestMethod.POST)
- public void getBossInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getBossInfo(WXMPAcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
@@ -354,6 +364,103 @@
}
/**
+ * 绔欏唴淇℃彁閱掗槦鍛樻坊鍔犲井淇″彿
+ *
+ * @param acceptData
+ * @param uid
+ * @param inviteId
+ * @param out
+ */
+ @RequestMapping(value = "remindBossAddWX")
+ public void remindTeam(WXMPAcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("浼犻�掑弬鏁扮己澶�"));
+ return;
+ }
+
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛淇℃伅涓嶅瓨鍦�"));
+ return;
+ }
+
+ ThreeSale threeSale = threeSaleSerivce.getByWorkerId(uid);
+ if (threeSale == null) {
+ out.print(JsonUtil.loadFalseResult("娌℃湁閭�璇蜂汉"));
+ return;
+ }
+
+ Long remindId = null;
+ boolean remindBoss = true;
+ if (uid.longValue() == threeSale.getWorker().getId().longValue()) {
+ remindId = threeSale.getBoss().getId(); // 鎻愰啋涓婄骇
+ } 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 content = "";
+ if (remindBoss) {
+ // 鎻愮ず闃熼暱
+ bossId = remindId;
+ workerId = uid;
+ content = "浣犵殑鐩存帴绮変笣" + userInfo.getNickName()
+ + "锛屾彁閱掍綘娣诲姞寰俊鍙凤紝浠ヤ究浜庡拰浣犲彇寰楄仈绯诲拰瀛︿範鐪侀挶鎶�宸э紝璧跺揩鍘绘坊鍔犲惂锛涙敞锛氳鍗囩骇鍒版湰杞欢鏈�鏂扮増鏈湪鈥滄垜鐨�-鎴戠殑淇℃伅鈥濅腑娣诲姞銆�";
+ } else {
+ // 鎻愮ず闃熷憳
+ bossId = uid;
+ workerId = remindId;
+ 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);
+
+ 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());
+ newInfo.setUpdateTime(new Date());
+ threeSaleExtraInfoSerivce.updateByPrimaryKeySelective(newInfo);
+ } else {
+ newInfo.setBoss(new UserInfo(bossId));
+ newInfo.setWorker(new UserInfo(workerId));
+ newInfo.setCreateTime(new Date());
+ newInfo.setUpdateTime(new Date());
+ threeSaleExtraInfoSerivce.insertSelective(newInfo);
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("weiXinState", 2);
+ data.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ e.printStackTrace();
+ out.print(JsonUtil.loadFalseResult("鎻愰啋澶辫触"));
+ }
+ }
+
+ /**
* 涓婄骇淇℃伅缁勭粐
*
* @param acceptData
--
Gitblit v1.8.0