From 98d98236aa182386835d65794f772f6425cb14b5 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 22 十一月 2018 15:02:00 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 121 ++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index e08a89b..57fae0b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -50,6 +50,7 @@
import com.yeshi.fanli.entity.bus.user.PassWordErrorRecord;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
@@ -65,6 +66,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
@@ -132,6 +134,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
@Resource
private LostOrderService lostOrderService;
@@ -1592,7 +1597,7 @@
* @param id
* @param out
*/
- @RequestMapping(value = "getMyTeam")
+ @RequestMapping(value = "getMyTeam", method = RequestMethod.POST)
public void getMyTeam(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {
int pageSize = Constant.PAGE_SIZE;
@@ -1602,23 +1607,7 @@
resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
} else if (type == 2) {
resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
- } else if (type == 3) {
-
- ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
- if (threeSale != null) {
-
- UserInfo boss = threeSale.getBoss();
- if (boss != null) {
- resultData.put("nickName", boss.getNickName());
- resultData.put("portrait", boss.getPortrait());
- }
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Long createTime = threeSale.getCreateTime();
- Date inviteTime = new Date(createTime);
- resultData.put("inviteTime", "閭�璇锋椂闂�:" + sdf.format(inviteTime));
- }
- }
+ }
out.print(JsonUtil.loadTrueResult(resultData));
}
@@ -1629,7 +1618,7 @@
* @param id
* @param out
*/
- @RequestMapping(value = "countMyTeam")
+ @RequestMapping(value = "countMyTeam", method = RequestMethod.POST)
public void countMyTeam(AcceptData acceptData, long uid, PrintWriter out) {
long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
@@ -1638,14 +1627,108 @@
long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+ JSONObject bossData = new JSONObject();
+ ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
+ if (threeSale != null) {
+
+ UserInfo boss = threeSale.getBoss();
+ if (boss != null) {
+ bossData.put("nickName", boss.getNickName());
+ bossData.put("portrait", boss.getPortrait());
+ }
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Long createTime = threeSale.getCreateTime();
+ Date inviteTime = new Date(createTime);
+ bossData.put("inviteTime", "閭�璇锋椂闂�:" + sdf.format(inviteTime));
+ }
+
+
JSONObject resultData = new JSONObject();
resultData.put("firstTeam", firstTeam);
resultData.put("firstTeamTotal", firstTeamTotal);
resultData.put("secondTeam", secondTeam);
resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("boss", bossData);
out.print(JsonUtil.loadTrueResult(resultData));
}
+ /**
+ * 鐢ㄦ埛闃熷憳淇℃伅淇濆瓨 1.4.1
+ * @param acceptData
+ * @param uid
+ * @param inviteId 閭�璇穒d
+ * @param nickname
+ * @param out
+ */
+ @RequestMapping(value = "setextrainfo", method = RequestMethod.POST)
+ public void setExtraInfo(AcceptData acceptData, long uid, long inviteId, String nickname, PrintWriter out) {
+
+ List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, null);
+ if (listThreeSale == null || listThreeSale.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
+ }
+
+ UserInfo worker = listThreeSale.get(0).getWorker();
+ if (worker == null) {
+ out.print(JsonUtil.loadFalseResult("璇ヨ褰曚笉瀛樺湪"));
+ return;
+ }
+
+ List<ThreeSaleExtraInfo> list = threeSaleExtraInfoSerivce.listbyBossIdAndWorkerId(uid, worker.getId());
+ if (list == null || list.size() == 0) {
+
+ ThreeSaleExtraInfo extraInfo = new ThreeSaleExtraInfo();
+ extraInfo.setWorker(worker);
+ extraInfo.setNickname(nickname);
+ extraInfo.setCreateTime(new Date());
+ extraInfo.setUpdateTime(new Date());
+
+ UserInfo boss = new UserInfo(uid);
+ extraInfo.setBoss(boss);
+
+ threeSaleExtraInfoSerivce.insert(extraInfo);
+
+ } else {
+ ThreeSaleExtraInfo extraInfo = list.get(0);
+ extraInfo.setNickname(nickname);
+ threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
+ }
+
+ out.print(JsonUtil.loadTrueResult("淇敼鎴愬姛"));
+ }
+
+ /**
+ * 鍒犻櫎闃熷憳鍏崇郴
+ * @param acceptData
+ * @param uid
+ * @param inviteId 閭�璇穒d
+ * @param out
+ */
+ @RequestMapping(value = "removethreesale", method = RequestMethod.POST)
+ public void removethreesale(AcceptData acceptData, long uid, long inviteId, PrintWriter out) {
+
+ List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
+ if (listThreeSale == null || listThreeSale.size() == 0) {
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ return;
+ }
+
+ UserInfo worker = listThreeSale.get(0).getWorker();
+ if (worker == null) {
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ return;
+ }
+
+ // 鍒犻櫎鍏崇郴
+ threeSaleSerivce.deleteByPrimaryKey(inviteId);
+ // 鍒犻櫎澶囨敞
+ threeSaleExtraInfoSerivce.deleteByBossIdAndWorkerId(uid, worker.getId());
+
+ out.print(JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ }
+
}
--
Gitblit v1.8.0