From d1dccd08a249b830a95eeeb04af25f87d5c056be Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 11:13:04 +0800
Subject: [PATCH] 金币明细bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 92 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 11 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 346289b..d0b4dcc 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
@@ -27,9 +27,9 @@
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.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.VersionUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -52,6 +52,9 @@
private ThreeSaleSerivce threeSaleSerivce;
@Resource
+ private UserInfoService userInfoService;
+
+ @Resource
private UserInfoExtraService userInfoExtraService;
@Resource
@@ -71,6 +74,7 @@
JSONObject data = new JSONObject();
data.put("nickName", userInfo.getNickName());
data.put("portrait", userInfo.getPortrait());
+ data.put("tips", "纭瑕佹垚涓篢A鐨勪竴绾ч槦鍛樺悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
out.print(JsonUtil.loadTrueResult(data));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -89,6 +93,7 @@
JSONObject data = new JSONObject();
data.put("nickName", userInfo.getNickName());
data.put("portrait", userInfo.getPortrait());
+ data.put("tips", "纭瑕佹垚涓篢A鐨勪竴绾ч槦鍛樺悧锛熼個璇峰叧绯讳竴鏃﹀缓绔嬩笉鍙洿鏀广��");
out.print(JsonUtil.loadTrueResult(data));
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -121,6 +126,18 @@
// 缁勭粐鏁版嵁
JSONObject resultData = organizeTeam(count, listTeam, uid, type);
+
+ // 绗竴椤靛垽鏂槸鍚︽縺娲� 鏄惁鏈夐槦鍛�
+ if (type == 1 && page == 1) {
+ boolean hasCode = false;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
+ hasCode = true;
+ }
+ resultData.put("hasCode", hasCode);
+ resultData.put("hasTeam", count > 0? true:false);
+ }
out.print(JsonUtil.loadTrueResult(resultData));
}
@@ -227,12 +244,21 @@
public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
JSONObject bossData = getBossInfo(acceptData, uid, threeSaleSerivce.getMyBoss(uid));
JSONObject resultData = new JSONObject();
+
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
resultData.put("boss", bossData);
resultData.put("helpLink", configService.get("team_help_url"));
- resultData.put("firstTeam", threeSaleSerivce.countFirstTeam(uid, 1));
+ 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));
+
+ boolean hasTeam = true;
+ if (firstTeam <= 0) {
+ hasTeam = false;
+ resultData.put("invitelink", configService.get("invite_activation_url"));
+ }
+ resultData.put("hasTeam", hasTeam);
boolean hasCode = false;
boolean bdWeiXin = false;
@@ -245,15 +271,15 @@
bdWeiXin = true;
}
- List<String> tipCode = new ArrayList<String>();
// 鏈縺娲婚個璇风爜
+ resultData.put("hasCode", hasCode);
if (!hasCode) {
+ List<String> tipCode = new ArrayList<String>();
resultData.put("helpLinkActivate", configService.get("team_help_url"));
tipCode.add("婵�娲婚個璇峰姛鑳藉悗鎵嶅彲浠ラ個璇烽槦鍛橈紝涓�绾ч槦鍛樻槸鐢变綘鐩存帴閭�璇凤紝浜岀骇闃熷憳鏄敱浣犵殑涓�绾ч槦鍛橀個璇枫��");
tipCode.add("閭�璇锋縺娲诲姛鑳斤紝蹇呴』瑕佹湁閭�璇风爜锛岄個璇风爜鍙互閫氳繃閲戝竵鍏戞崲锛屼篃鍙互鍏ㄧ綉鎼滅储銆�");
+ resultData.put("tipCode", tipCode);
}
- resultData.put("hasCode", hasCode);
- resultData.put("tipCode", tipCode);
// 鏈坊鍔犲井淇″彿
List<String> tipWeiXin = new ArrayList<String>();
@@ -262,6 +288,7 @@
tipWeiXin.add("浣犱篃鍙互鍚戦個璇蜂汉瀛︿範鎴栧悜涓�绾ч槦鍛樻暀鎺堣禋閽辨妧宸с��");
}
resultData.put("tipWeiXin", tipWeiXin);
+ resultData.put("tipWeiXinAdd", "娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�");
resultData.put("bdWeiXin", bdWeiXin);
out.print(JsonUtil.loadTrueResult(resultData));
@@ -301,7 +328,6 @@
}
}
bossData.put("inviteTime", "浣犱簬 " + sdf.format(inviteTime) + "鎺ュ彈浜員A鐨勯個璇�");
-
} else {
bossData.put("hasBoss", false);
bossData.put("helpLink", configService.get("invite_code_hlep_link"));
@@ -326,6 +352,12 @@
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涓嶅瓨鍦�"));
@@ -333,9 +365,11 @@
}
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(); // 鎻愰啋涓嬬骇
}
@@ -344,21 +378,57 @@
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, "", "", listIOS, listAndroid);
-
- userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.question,
- "", "", UserSystemMsg.TIME_TAG_EMERGENT, null);
+ 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("鎻愰啋澶辫触"));
- return;
}
}
}
--
Gitblit v1.8.0