From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 318 ----------------------------------------------------
1 files changed, 1 insertions(+), 317 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 f89ae64..6e7985c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -1,13 +1,9 @@
package com.yeshi.fanli.controller;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -15,31 +11,19 @@
import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.wx.WXUtil;
-import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
-import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.CustomerContent;
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.share.ShareGoodsException;
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -59,12 +43,9 @@
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;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONArray;
@@ -137,116 +118,6 @@
private static final String DOWNURL2 = "http://121.42.200.138/apk/fanliquan20180124.apk";
- @RequestMapping("coupon")
- public String conpon(Model model) {
- List<TaoBaoCoupon> couponList = taoBaoCouponService.getTaoBaoCouponList("", 1);
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
- String jsonArr = Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(couponList));
- JSONArray jsonArray = JSONArray.fromObject(jsonArr);
- List<TaoBaoCoupon> collection = (List<TaoBaoCoupon>) JSONArray.toCollection(jsonArray, TaoBaoCoupon.class);
- model.addAttribute("couponList", collection);
- model.addAttribute("proportion", proportion);
- return "coupon";
- }
-
- //璇ユ柟娉曚互鍙婂簾寮�
- @Deprecated
- @RequestMapping("findThreeFriendsCount")
- public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
-
- }
-
- //璇ユ柟娉曚互鍙婂簾寮�
- @Deprecated
- @RequestMapping("findThreeFriends")
- public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
-
- }
-
- @RequestMapping(value = "getConpon", method = RequestMethod.POST)
- public void getConpon(int page, PrintWriter out) {
- List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
- JSONObject data = new JSONObject();
- data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));
- data.put("proportion", proportion);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping("share")
- public String getShare(Model model, String uid) {
- String value = configService.get("share_message");
- try {
- if (uid == null) {
- uid = "0";
- }
- String base64String = StringUtil.getBase64String(uid + "");
- String format = MessageFormat.format(value, base64String);
- model.addAttribute("share", format);
- model.addAttribute("down",
- "http://file.sovideo.cn/buxinjie/weixinfriendinvite/index.html?yqm=" + base64String);
- model.addAttribute("shareCode", "閭�璇风爜锛�" + base64String);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return "getcash";
- }
-
- @RequestMapping("shares")
- public String getShares(Model model, String uid) {
- String value = configService.get("share_message");
- try {
- if (uid == null) {
- uid = "0";
- }
- String base64String = StringUtil.getBase64String(uid + "");
- String format = MessageFormat.format(value, base64String);
- model.addAttribute("share", format);
- model.addAttribute("uid", uid);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return "invite";
- }
-
- @RequestMapping(value = "/{uid}")
- public String threeShareRep(@PathVariable String uid, String code, String state, String packages, String platform,
- String ios, HttpSession httpSession, HttpServletRequest request) {
-
- BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
- String wxState = (String) httpSession.getAttribute("wxState");
- // 閫氳繃閰嶇疆鍙傛暟鑾峰彇
- String down = DOWNURL2;
-
- SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,
- "fenxiao_download_apk_url");
- if (params != null)
- down = params.getValue();
- if ("2".equalsIgnoreCase(ios)) {
- down = DOWNURL;
- }
- if (state == null || !state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
- // 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;
- }
-
- return "redirect:" + down;
- }
-
@RequestMapping(value = "/new/{uid}")
public String threeShareRepNew(@PathVariable String uid, String code, String state, String packages,
String platform, String ios, HttpSession httpSession, HttpServletRequest request) {
@@ -261,7 +132,7 @@
if (params != null)
down = params.getValue();
- if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+ if (state!=null&&!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
// request.setAttribute("error", "1");
return "redirect:" + down;
}
@@ -270,43 +141,6 @@
userInviteRecordService.saveInviteRecord(code, uid);
return "redirect:" + down;
- }
-
- @RequestMapping("threeShare")
- public String threeShare(HttpServletRequest request, HttpSession session, long uid) {
- String serverName = request.getServerName();
- String contextPath = request.getContextPath();
- UserInfo userInfo = userInfoService.getUserById(uid);
- if (userInfo == null) {
- return "share/error";
- }
-
- try {
- String header = request.getHeader("User-Agent");// MicroMessenger锛氬井淇℃祻瑙堝櫒
- String ios = "ios=1";
- if (header.contains("iPhone")) {
- ios = "ios=2";
- }
- String redirect_uri = "http://" + serverName + contextPath + "/client/" + uid + "?packages="
- + Constant.systemCommonConfig.getAndroidPackageName() + "&platform=ANDROID&" + ios;
- redirect_uri = URLEncoder.encode(redirect_uri, "utf-8");
- long currentTimeMillis = java.lang.System.currentTimeMillis();
- String md5 = StringUtil.Md5(currentTimeMillis + "");
- session.setAttribute("wxState", md5);
- String baseUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + WXLoginUtil.WEXIN_APPID
- + "&redirect_uri=" + redirect_uri + "&response_type=code&scope=snsapi_userinfo&state=" + md5
- + "#wechat_redirect";
- // List<HongBaoMessage> list =
- // shamUserService.findShamThreeSaleInfo();
- request.setAttribute("jumpUrl", baseUrl);
- request.setAttribute("name", userInfo.getNickName());
- request.setAttribute("picture", userInfo.getPortrait());
- // request.setAttribute("list", list);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return "share2/yaoqing";
}
// 鏂扮増鍒嗕韩
@@ -341,110 +175,6 @@
}
return "share2/yaoqing";
- }
-
- @RequestMapping("callBack")
- public void callBack(HttpServletRequest request, PrintWriter out) {
- if (!StringUtil.isNullOrEmpty(request.getParameter("echostr"))) {
- out.print(request.getParameter("echostr"));
- return;
- }
-
- Map<String, String> map = WXUtil.parseXML(request);
- String ghId = map.get("ToUserName");
- if (ghId == null) {
- out.print("");
- return;
- }
- String type = map.get("MsgType");
- if ("event".equalsIgnoreCase(type)) {
- String event = map.get("Event");
- if (event.equalsIgnoreCase("subscribe")) {// 鍏虫敞
- Map<String, String> parmas = new HashMap<>();
- parmas.put("ToUserName", map.get("FromUserName"));
- parmas.put("FromUserName", ghId);
- parmas.put("CreateTime", java.lang.System.currentTimeMillis() / 1000 + "");
- parmas.put("MsgType", "text");
- parmas.put("Content", Constant.wxGZConfig.getWelcomeMsg());
- out.print(WXUtil.loadWXMessage(parmas));
- }
- } else if ("text".equalsIgnoreCase(type)) {
- String content = map.get("Content");
- if (!StringUtil.isNullOrEmpty(content)) {
- try {
- if (request.getSession().getAttribute("search-quan-" + map.get("FromUserName")) == null) {
- request.getSession().setAttribute("search-quan-" + map.get("FromUserName"), "1");
- 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<>();
- parmas.put("ToUserName", map.get("FromUserName"));
- parmas.put("FromUserName", ghId);
- parmas.put("CreateTime", java.lang.System.currentTimeMillis() / 1000 + "");
- parmas.put("MsgType", "text");
- parmas.put("Content", String.format("[寰瑧]鎶辨瓑锛屾病鏈夎兘涓轰綘鎵惧埌鍏充簬銆�%s銆戠殑浼樻儬鍒革紝[鏈烘櫤]浣犲彲浠ヨ瘯璇曞叾浠栧叧閿瘝", content));
- out.print(WXUtil.loadWXMessage(parmas));
- } else {
- String host = HttpUtil.getHost(Constant.wxGZConfig.getH5Url());
- String url = HttpUtil.getShortLink("http://" + host + "/search.html?key=" + content);
- String text = String.format("[寰楁剰]宸茬粡涓轰綘鎵惧埌浜嗗叧浜庛��%s銆戠殑浼樻儬鍒� \n 馃憠 %s", content, url);
- Map<String, String> parmas = new HashMap<>();
- parmas.put("ToUserName", map.get("FromUserName"));
- parmas.put("FromUserName", ghId);
- parmas.put("CreateTime", java.lang.System.currentTimeMillis() / 1000 + "");
- parmas.put("MsgType", "text");
- parmas.put("Content", text);
- out.print(WXUtil.loadWXMessage(parmas));
- }
- }
-
- } finally {
- request.getSession().removeAttribute("search-quan-" + map.get("FromUserName"));
- }
-
- }
-
- }
-
- }
-
- @RequestMapping("shareGoods")
- public void shareGoods(String auctionId, PrintWriter out) {
- TaoBaoGoodsBrief alimama = null;
- try {
- alimama = redisManager.getTaoBaoGoodsBrief(Long.parseLong(auctionId));
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
- if (alimama != null) {
- List<TaoBaoUnionConfig> config = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
- TaoBaoGoodsBrief tb = null;
- try {
- tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(auctionId));
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, config.get(0));
- JSONObject data = new JSONObject();
- data.put("tb", GsonUtil.toJsonExpose(taoBaoGoodsBriefExtra));
- if ("1".equalsIgnoreCase(tb.getTkMktStatus())) {// 钀ラ攢璁″垝
- data.put("yxjh", 1);
- } else
- data.put("yxjh", 0);
-
- out.println(JsonUtil.loadTrueResult(data));
- return;
- }
- JsonUtil.loadFalseResult("鍟嗗搧宸蹭笅鏋讹紒");
}
@RequestMapping("getShareGoodsInfo")
@@ -521,52 +251,6 @@
out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
- }
-
- }
-
- @RequestMapping("getShareGoodsDetail")
- public void getShareGoodsDetail(String uid, long id, String sign, PrintWriter out) {
- // 娣诲姞鍒嗕韩
- uid = AESUtil.decrypt(uid);
- if (StringUtil.isNullOrEmpty(uid)) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶅瓨鍦�"));
- return;
- }
-
- try {
- UserShareGoodsHistory userShareGoodsHistory = shareGoodsService
- .getShareGoodsHistoryDetail(Long.parseLong(uid), id);
- if (userShareGoodsHistory == null) {
- out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
- return;
- }
-
- TaoBaoGoodsBrief goods = null;
- try {
- goods = redisManager.getTaoBaoGoodsBrief(userShareGoodsHistory.getGoodsId());
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
- JSONObject data = JSONObject.fromObject(JsonUtil.getSimpleGson().toJson(userShareGoodsHistory));
- JSONObject goodsJSON = new JSONObject();
- goodsJSON.put("title", goods.getTitle());
- goodsJSON.put("zkPrice", goods.getZkPrice());
- // 鏈夊埜
- if (!StringUtil.isNullOrEmpty(goods.getCouponInfo())) {
- BigDecimal finalPrice = goods.getZkPrice();
- if (goods.getCouponStartFee().compareTo(goods.getZkPrice()) <= 0
- && goods.getZkPrice().compareTo(goods.getCouponAmount()) >= 0) {
- finalPrice = goods.getZkPrice().subtract(goods.getCouponAmount());
- }
- goodsJSON.put("finalPrice", finalPrice);
- }
- data.put("goods", goodsJSON);
- out.print(JsonUtil.loadTrueResult(data));
- } catch (ShareGoodsException e1) {
- out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
-
- e1.printStackTrace();
}
}
--
Gitblit v1.8.0