From c2c4c6a48620a4f2e1452ee33a8df0e9d96d2cd7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 三月 2019 11:16:22 +0800
Subject: [PATCH] 删除多余代码，淘口令数据库缓存添加
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 134 +-------------------------------------------
1 files changed, 3 insertions(+), 131 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 ed6d9de..8283eba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -1,12 +1,10 @@
package com.yeshi.fanli.controller;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
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;
@@ -25,13 +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.clazz.GoodsSecondClass;
-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;
@@ -40,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;
@@ -53,20 +44,13 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
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;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.AESUtil;
@@ -95,16 +79,10 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
- @Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
-
- @Resource
- private ScanHistoryService scanHistoryService;
-
+
@Resource
private ConfigService configService;
-
+
@Resource
private HongBaoManageService hongBaoManageService;
@@ -113,26 +91,12 @@
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
- @Resource
- private RecommendDetailsService recommendDetailsService;
- @Resource
- private RecommendSectionService recommendSectionService;
-
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
-
- @Resource
- private RecommendSectionDetailService recommendSectionDetailService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@Resource
private UserInfoService userInfoService;
-
- @Resource
- private ThreeSaleRankService threeSaleRankService;
@Resource
private BusinessSystemService businessSystemService;
@@ -159,27 +123,6 @@
+ Constant.systemCommonConfig.getAndroidPackageName();
private static final String DOWNURL2 = "http://121.42.200.138/apk/fanliquan20180124.apk";
-
- @RequestMapping("classify")
- public String setClassify(long id, String key, String title, Model model) {
- String decodeKey = "";
- String decodeName = "";
- try {
- decodeKey = new String(key.getBytes("iso8859-1"), "UTF-8");
- decodeName = new String(title.getBytes("iso8859-1"), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- decodeKey = key;
- decodeName = title;
- e.printStackTrace();
- }
- List<GoodsSecondClass> goodsSecondClassList = goodsSecondClassService.getGoodsSecondClassByGoodsClassId(id);
- List<TaoBaoGoodsBriefExtra> taoBaoGoodsBriefExtraList = scanHistoryService
- .getHotTaoBaoGoodsBriefExtras(decodeKey, 1);
- model.addAttribute("goodsSecondClassList", goodsSecondClassList);
- model.addAttribute("taoBaoGoodsBriefExtraList", taoBaoGoodsBriefExtraList);
- model.addAttribute("title", decodeName);
- return "classify";
- }
@RequestMapping("coupon")
public String conpon(Model model) {
@@ -239,17 +182,6 @@
data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));
data.put("proportion", proportion);
out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping(value = "getHotGoods", method = RequestMethod.POST)
- public void getHotGoods(String key, int page, PrintWriter out) {
- List<TaoBaoGoodsBriefExtra> taoBaoGoodsBriefExtraList = scanHistoryService.getHotTaoBaoGoodsBriefExtras(key,
- page);
- if (taoBaoGoodsBriefExtraList.size() > 0) {
- out.append(JsonUtil.loadTrueResult(taoBaoGoodsBriefExtraList));
- } else {
- out.append(JsonUtil.loadFalseResult("娌℃湁鏇村鍟嗗搧"));
- }
}
@RequestMapping("share")
@@ -497,66 +429,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")
--
Gitblit v1.8.0