From d6ac376bbb16b750501ed47df999536980870b96 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 21 十一月 2018 18:22:02 +0800
Subject: [PATCH] 前端：队员列表1.4.1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 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 9de8ac9..2e434a1 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
@@ -4,6 +4,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -14,11 +15,13 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
@@ -46,6 +49,7 @@
import com.yeshi.fanli.entity.bus.user.OrderItem;
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.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
@@ -88,9 +92,6 @@
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/customer")
@@ -1583,4 +1584,42 @@
.loadTrueResult(String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl())));
}
+
+ /**
+ * 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.4.1
+ * @param acceptData
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "getMyTeam")
+ public void getMyTeam(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {
+
+ int pageSize = Constant.PAGE_SIZE;
+
+ JSONObject resultData = new JSONObject();
+ if (type == 1) {
+ 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));
+ }
+
}
--
Gitblit v1.8.0