From 25295657ad6d1675462f0b6814366417bbda6d99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 13 六月 2019 17:35:47 +0800
Subject: [PATCH] 通用模板9块9添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java | 48 ++++++++++++++----------------------------------
1 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
index 05f98fd..8d7399d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -15,16 +15,18 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dto.common.CommonContentNav;
+import com.yeshi.fanli.dto.common.CommonContentResult;
+import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.banner.SwiperPictureException;
+import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -45,6 +47,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+ @Resource
+ private CommonTemplateContentService commonTemplateContentService;
+
/**
* 閫氱敤妯℃澘瀵艰埅
*
@@ -58,23 +63,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
return;
}
- List<CommonContentNav> list = new ArrayList<>();
- for (int i = 0; i < 20; i++) {
- CommonContentNav gc = new CommonContentNav();
- gc.setCid((i + 1L) + "");
- if (i == 1) {
- gc.setName("娴嬭瘯" + i);
- gc.setPicture(
- "http://e.hiphotos.baidu.com/zhidao/pic/item/37d3d539b6003af3be51388a322ac65c1138b675.jpg");
- } else if (i == 2) {
- gc.setName("");
- gc.setPicture(
- "http://e.hiphotos.baidu.com/zhidao/pic/item/37d3d539b6003af3be51388a322ac65c1138b675.jpg");
- } else {
- gc.setName("娴嬭瘯" + i);
- }
- list.add(gc);
- }
+ List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
out.print(JsonUtil.loadTrueResult(new Gson().toJson(list)));
}
@@ -99,34 +88,25 @@
return;
}
+ CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
+ cid, page, Constant.PAGE_SIZE);
+
+ // 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
List<SwiperPicture> bannerList = new ArrayList<>();
- try {
- bannerList = swiperPictureService.getByBannerCard("index_top");
- } catch (SwiperPictureException e) {
- e.printStackTrace();
- }
JSONObject root = new JSONObject();
if (page == 1)
root.put("bannerList", new Gson().toJson(bannerList));
-
- root.put("goodsCount", 200);
- SearchFilter sf = new SearchFilter();
- sf.setKey("闉�");
- sf.setPage(page);
- sf.setPageSize(20);
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
BigDecimal pro = hongBaoManageService.getFanLiRate();
- List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.searchWuLiao(sf).getTaoBaoGoodsBriefs();
+ List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "")));
}
-
root.put("goodsList", array);
-
-
+ root.put("goodsCount", result.getCount());
out.print(JsonUtil.loadTrueResult(root));
}
--
Gitblit v1.8.0