From d36d1adfd749fed26923f7e3664a36d405b0acfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 五月 2019 16:05:17 +0800
Subject: [PATCH] 大淘客数据修改，热销推广商品接口修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/HotSellController.java | 119 +++++++++++++++++++++++++++--------------------------------
1 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/HotSellController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/HotSellController.java
index 6ddedba..3354d62 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/HotSellController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/HotSellController.java
@@ -13,19 +13,21 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
+import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import com.yeshi.fanli.vo.dynamic.DynamicClassVO;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import net.sf.json.JSONObject;
/**
* 鐑攢姒�
+ *
* @author Administrator
*
*/
@@ -35,55 +37,35 @@
@Resource
private HongBaoManageService hongBaoManageService;
-
+
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
+ @Resource
+ private DaTaoKeGoodsService daTaoKeGoodsService;
/**
* 鏌ヨ鍒嗙被
+ *
* @param acceptData
- * @param cid 2瀹炴椂 3浠婃棩 1鐑攢
+ * @param cid
+ * 2瀹炴椂 3浠婃棩 1鐑攢
* @param out
*/
@RequestMapping(value = "getClass", method = RequestMethod.POST)
public void getClass(AcceptData acceptData, Integer cid, PrintWriter out) {
try {
- List<DynamicClassVO> list = new ArrayList<DynamicClassVO>();
-
- DynamicClassVO c0 = new DynamicClassVO();
- c0.setId(0L);
- c0.setName("鍏ㄩ儴");
-
- DynamicClassVO c1 = new DynamicClassVO();
- c1.setId(1L);
- c1.setName("鐢疯");
-
- DynamicClassVO c2 = new DynamicClassVO();
- c2.setId(2L);
- c2.setName("灞呭鏃ョ敤");
-
- DynamicClassVO c3 = new DynamicClassVO();
- c3.setId(3L);
- c3.setName("缇庨");
-
- DynamicClassVO c4 = new DynamicClassVO();
- c4.setId(4L);
- c4.setName("姣嶅┐");
-
- DynamicClassVO c5= new DynamicClassVO();
- c5.setId(5L);
- c5.setName("鏁扮爜");
-
- list.add(c0);
- list.add(c1);
- list.add(c2);
- list.add(c3);
- list.add(c4);
- list.add(c5);
+ List<GoodsClass> list = new ArrayList<GoodsClass>();
+ if (cid == 2 || cid == 3) {
+ GoodsClass c0 = new GoodsClass();
+ c0.setId(0L);
+ c0.setName("鍏ㄩ儴");
+ list.addAll(DaTaoKeUtil.goodsClasses);
+ list.add(0, c0);
+ }
JSONObject data = new JSONObject();
data.put("count", 1);
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
@@ -94,44 +76,53 @@
}
}
-
/**
* 鑾峰彇鍔ㄦ�佸垪琛�
+ *
* @param acceptData
* @param page
- * @param cid 涓诲垎绫�
- * @param subId 瀛愬垎绫籭d
+ * @param cid
+ * 涓诲垎绫�(瀹炴椂-2 浠婃棩-3 鐑攢-1)
+ * @param subId
+ * 瀛愬垎绫籭d
* @param out
*/
@RequestMapping(value = "getList", method = RequestMethod.POST)
- public void getList(AcceptData acceptData, Integer page, Integer cid, Integer subId, PrintWriter out) {
+ public void getList(AcceptData acceptData, Integer page, Integer cid, Integer subId, PrintWriter out) {
try {
+ // 鍏ㄩ儴
+ if (subId != null && subId == 0)
+ subId = null;
TaoBaoGoodsBriefExtra goods = null;
- List<TaoBaoGoodsBrief> listgoods = taoBaoGoodsBriefService.queryByAuctionId(584995369742L);
- if (listgoods != null && listgoods.size() > 0) {
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
- goods = TaoBaoUtil.getTaoBaoGoodsBriefExtra( listgoods.get(0), proportion.toString(), null);
+ List<DaTaoKeDetail> detailList = null;
+ if (cid == 1) {
+ detailList = daTaoKeGoodsService.getCurrentHotSalesRankGoodsList();
+ } else if (cid == 2) {
+ detailList = daTaoKeGoodsService.getCurrentSalesRankGoodsList(subId);
+ } else {
+ detailList = daTaoKeGoodsService.getCurrentDaySalesRankGoodsList(subId);
}
- goods.setSalesType(cid);
- // 鏍囩
- List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
- ClientTextStyleVO textVO1 = new ClientTextStyleVO();
- textVO1.setColor("#FE0014");
- textVO1.setContent("鍏泭瀹濊礉");
-
- ClientTextStyleVO textVO2 = new ClientTextStyleVO();
- textVO2.setColor("#FF9600");
- textVO2.setContent("澶忓鐖嗘");
- labels.add(textVO1);
- labels.add(textVO2);
- goods.setLabels(labels);
-
- List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- list.add(goods);
+ if (detailList == null)
+ detailList = new ArrayList<>();
+
+ List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ if (detailList != null)
+ for (DaTaoKeDetail detail : detailList) {
+ goods = TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail), proportion.toString(),
+ null);
+ if (cid == 2)
+ goods.setSalesType(2);
+ else if (cid == 3)
+ goods.setSalesType(3);
+ else
+ goods.setSalesType(1);
+ list.add(goods);
+ }
JSONObject data = new JSONObject();
- data.put("count", 1);
+ data.put("count", detailList.size());
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -139,5 +130,5 @@
e.printStackTrace();
}
}
-
+
}
--
Gitblit v1.8.0