From a2ae9b3d890bc7fcaa34ab65e5cdaf8ccfa07c2b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 13 十一月 2019 15:35:12 +0800
Subject: [PATCH] 红包弹框加入设备验证
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 44 +++++++++-----------------------------------
1 files changed, 9 insertions(+), 35 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 ee95d4f..80e5090 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -51,12 +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;
@@ -149,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)
@@ -285,7 +261,7 @@
if (params != null)
down = params.getValue();
- if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+ if (state!=null&&!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
// request.setAttribute("error", "1");
return "redirect:" + down;
}
@@ -337,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";
--
Gitblit v1.8.0