From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 150 ++++++++-----------------------------------------
1 files changed, 26 insertions(+), 124 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 da82ed5..f1e91cf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -5,7 +5,6 @@
import java.net.URLEncoder;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -24,12 +23,7 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.wx.WXUtil;
-import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.taobao.api.ApiException;
-import com.yeshi.fanli.entity.bus.recommend.RecommendDetails;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -38,7 +32,6 @@
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.RelateGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -49,14 +42,11 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.config.CustomerContentService;
+import com.yeshi.fanli.service.inter.config.CustomerNameService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
-import com.yeshi.fanli.service.inter.goods.ClassRecommendGoodsService;
import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
-import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionDetailService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -65,6 +55,7 @@
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.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -93,9 +84,6 @@
private GoodsSecondClassService goodsSecondClassService;
@Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
-
- @Resource
private ConfigService configService;
@Resource
@@ -106,17 +94,6 @@
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
- @Resource
- private RecommendDetailsService recommendDetailsService;
- @Resource
- private RecommendSectionService recommendSectionService;
-
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
-
- @Resource
- private RecommendSectionDetailService recommendSectionDetailService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -140,10 +117,19 @@
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
+ private UserInviteRecordService userInviteRecordService;
+
+ @Resource
private RedisManager redisManager;
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+
+ @Resource
+ private CustomerNameService customerNameService;
+
+ @Resource
+ private CustomerContentService customerContentService;
private static final String DOWNURL = "http://sj.qq.com/myapp/detail.htm?apkName="
+ Constant.systemCommonConfig.getAndroidPackageName();
@@ -262,10 +248,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;
}
@@ -301,20 +288,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;
}
@@ -457,66 +433,6 @@
}
- @RequestMapping("details")
- public String getRecommendDetails(long drid, Model model) {
- RecommendDetails recommendDetails = recommendDetailsService.getRecommendDetails(drid, 0);
- if (recommendDetails == null) {
- return "";
- }
- model.addAttribute("recommendDetails", recommendDetails);
- try {
- List<RelateGoods> list = TaoKeApiUtil
- .getRelateGoodsList(Long.parseLong(recommendDetails.getDynamicRecommend().getAuctionId()));
- String upicUrls = recommendDetails.getDynamicRecommend().getuPicUrl();
- String[] imgs = upicUrls.split(",");
- List<String> tbImg = Arrays.asList(imgs);
- // List<String> tbImg =
- // TaoBaoUtil.getTbImg(recommendDetails.getDynamicRecommend().getAuctionId());
- model.addAttribute("tbImgs", tbImg);
- model.addAttribute("relateGoodsList", list);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (ApiException e) {
- e.printStackTrace();
- }
- return "tuijian";
- }
-
- @RequestMapping("getRecommendSectionDetail")
- public void getRecommendSectionDetail(long id, PrintWriter out) {
- RecommendSectionDetail recommendSectionDetail = recommendSectionDetailService
- .getRecommendSectionDetailByRsId(id);
- if (recommendSectionDetail == null) {
- out.println(JsonUtil.loadFalseResult("recommendSectionDetail涓嶈兘涓虹┖"));
- return;
- }
- JSONObject data = new JSONObject();
- data.put("picUrl", recommendSectionDetail.getPicUrl());
- data.put("html", recommendSectionDetail.getHtmlCode());
- out.println(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping("getRecommendSectionGoodsList")
- public void getRecommendSectionGoodsList(long id, PrintWriter out) {
- List<RecommendSectionGoods> recommendSectionGoodsList = recommendSectionGoodsService
- .getRecommendSectionGoods(id, Integer.MAX_VALUE);
- if (recommendSectionGoodsList == null) {
- JsonUtil.loadFalseResult("鍟嗗搧涓虹┖锛�");
- return;
- }
- JSONObject data = new JSONObject();
- List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
- for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {
- list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),
- proportion.toString(), ""));
- }
-
- Gson gson = JsonUtil.getApiCommonGson();
- data.put("goodsList", gson.toJson(list));
- out.println(JsonUtil.loadTrueResult(data));
- }
-
@RequestMapping("shareGoods")
public void shareGoods(String auctionId, PrintWriter out) {
TaoBaoGoodsBrief alimama = null;
@@ -610,14 +526,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, "鏈煡閿欒"));
}
@@ -625,20 +537,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);
}
}
@@ -695,20 +597,20 @@
public void getHelpList(PrintWriter out) {
List<CustomerName> totalList = new ArrayList<>();
int page = 0;
- List<CustomerName> customerNameList = systemClientParamsService.customerNameList(page, "", 1);
+ List<CustomerName> customerNameList = customerNameService.customerNameList(page, "", 1);
if (customerNameList != null && customerNameList.size() > 0)
totalList.addAll(customerNameList);
while (customerNameList != null && customerNameList.size() == Constant.PAGE_SIZE) {
page++;
- customerNameList = systemClientParamsService.customerNameList(page, "", 1);
+ customerNameList = customerNameService.customerNameList(page, "", 1);
if (customerNameList != null && customerNameList.size() > 0)
totalList.addAll(customerNameList);
}
// 鑾峰彇姣忎釜涓嬮潰鐨勮鎯�
for (CustomerName cn : totalList) {
- List<CustomerContent> contentList = systemClientParamsService.getSecondProblemList(0, "", cn.getId());
+ List<CustomerContent> contentList = customerContentService.getSecondProblemList(0, "", cn.getId());
cn.setCustomerContentList(contentList);
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(totalList)));
@@ -717,7 +619,7 @@
@RequestMapping("getHelpDetail")
public void getHelpDetail(long id, PrintWriter out) {
List<CustomerName> totalList = new ArrayList<>();
- CustomerContent customerContent = systemClientParamsService.getCustomerContent(id);
+ CustomerContent customerContent = customerContentService.getCustomerContent(id);
out.print(JsonUtil.loadTrueResult(customerContent.getContent().replace("\n", "<br>")));
}
--
Gitblit v1.8.0