From 481da0ca0ac931f6ff35dbb8d70d4450d4252c17 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 09 十月 2019 09:46:45 +0800
Subject: [PATCH] 新版登录-绑定手机号
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 108 +++++++++++++++++-------------------------------------
1 files changed, 34 insertions(+), 74 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index 9077c8b..f89ae64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -32,12 +32,13 @@
import com.yeshi.fanli.entity.system.CustomerName;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.PidUser;
+import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.exception.ShareGoodsException;
+import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
@@ -50,11 +51,12 @@
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserInviteRecordService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -81,7 +83,7 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
+
@Resource
private ConfigService configService;
@@ -93,7 +95,7 @@
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -116,14 +118,17 @@
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
+ private UserInviteRecordService userInviteRecordService;
+
+ @Resource
private RedisManager redisManager;
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
-
+
@Resource
private CustomerNameService customerNameService;
-
+
@Resource
private CustomerContentService customerContentService;
@@ -144,42 +149,18 @@
return "coupon";
}
+ //璇ユ柟娉曚互鍙婂簾寮�
+ @Deprecated
@RequestMapping("findThreeFriendsCount")
public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
- int count1 = userInfoService.findFriendsCount(id, 1);
- int count2 = userInfoService.findFriendsCount(id, 2);
- JSONObject data = new JSONObject();
- data.put("count1", count1);
- data.put("count2", count2);
-
- if (!StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
- } else {
- out.print(JsonUtil.loadTrueResult(data));
- }
+
}
+ //璇ユ柟娉曚互鍙婂簾寮�
+ @Deprecated
@RequestMapping("findThreeFriends")
public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
- int pageSize = 30;
- List<InviteUser> list = userInfoService.getFriendsList(id, type, page, pageSize);
- JSONArray array = new JSONArray();
- for (InviteUser user : list) {
- JSONObject item = JSONObject.fromObject(new GsonBuilder().create().toJson(user.getUserInfo()));
- item.put("valid", user.isValid());
- array.add(item);
- }
-
- long count = userInfoService.getFriendsListCount(id, type);
-
- JSONObject data = new JSONObject();
- data.put("list", array);
- data.put("pages", count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- if (!StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
- } else {
- out.print(JsonUtil.loadTrueResult(data));
- }
+
}
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
@@ -244,10 +225,11 @@
if ("2".equalsIgnoreCase(ios)) {
down = DOWNURL;
}
- if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+ if (state == null || !state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
// request.setAttribute("error", "1");
return "redirect:" + down;
}
+
if (code == null) {// 鐢ㄦ埛鍙栨秷浜嗙櫥闄嗭紒
return "redirect:" + down;
}
@@ -283,20 +265,9 @@
// request.setAttribute("error", "1");
return "redirect:" + down;
}
- if (code == null) {// 鐢ㄦ埛鍙栨秷浜嗙櫥闄嗭紒
- return "redirect:" + down;
- }
- UserInfo inviter = userInfoService.getUserById(Long.parseLong(uid));
- if (inviter == null) {// 娌″緱杩欎釜浜�
- return "redirect:" + down;
- }
-
- boolean b = userInfoService.inviteWXUserInfo(code, inviter);
- if (!b) { // 缁戝畾澶辫触
- // request.setAttribute("msg", "闈炲父閬楁喚锛屼綘宸查鍙栬繃绾㈠寘锛岃鍕垮啀娆￠鍙栥��");
- return "redirect:" + down;
- }
+ // 淇濆瓨閭�璇疯褰�
+ userInviteRecordService.saveInviteRecord(code, uid);
return "redirect:" + down;
}
@@ -342,8 +313,6 @@
@RequestMapping("threeShareNew")
public String threeShareNew(HttpServletRequest request, HttpSession session, HttpServletResponse response,
long uid) {
- String serverName = request.getServerName();
- String contextPath = request.getContextPath();
UserInfo userInfo = userInfoService.getUserById(uid);
if (userInfo == null) {
return "share/error";
@@ -405,7 +374,12 @@
try {
if (request.getSession().getAttribute("search-quan-" + map.get("FromUserName")) == null) {
request.getSession().setAttribute("search-quan-" + map.get("FromUserName"), "1");
- TaoBaoSearchResult result = TaoKeApiUtil.searchCouple(content, null, 1, 5);
+ SearchFilter sf = new SearchFilter();
+ sf.setPage(1);
+ sf.setPageSize(5);
+ sf.setKey(content);
+ sf.setQuan(1);
+ TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
if (result == null || result.getTaoBaoGoodsBriefs() == null
|| result.getTaoBaoGoodsBriefs().size() <= 0) {
Map<String, String> parmas = new HashMap<>();
@@ -532,14 +506,10 @@
}
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- try {
- JSONObject rdata = new JSONObject();
- rdata.put("uid", uid);
- rdata.put("id", id);
- LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ JSONObject rdata = new JSONObject();
+ rdata.put("uid", uid);
+ rdata.put("id", id);
+ LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());
out.print(JsonUtil.loadFalseResult(1001, "鏈煡閿欒"));
}
@@ -547,20 +517,10 @@
JSONObject data = new JSONObject();
data.put("uid", uid);
data.put("id", id);
-
- try {
- LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
+ LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());
out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
--
Gitblit v1.8.0