From 39d967a45c6b9834e943e670e8d8ea15b505beb1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 三月 2019 18:29:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 54 +-----------------------------------------------------
1 files changed, 1 insertions(+), 53 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..f291010 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -24,12 +24,9 @@
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;
@@ -51,12 +48,8 @@
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;
@@ -91,10 +84,7 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
- @Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
-
+
@Resource
private ConfigService configService;
@@ -109,14 +99,6 @@
@Resource
private RecommendDetailsService recommendDetailsService;
- @Resource
- private RecommendSectionService recommendSectionService;
-
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
-
- @Resource
- private RecommendSectionDetailService recommendSectionDetailService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -482,40 +464,6 @@
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) {
--
Gitblit v1.8.0