From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java
index 5545d14..a2ac3d7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/HotSellControllerV2.java
@@ -12,14 +12,16 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.log.LogHelper;
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.dataoke.DaTaoKeApiUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -49,6 +51,8 @@
private DaTaoKeGoodsService daTaoKeGoodsService;
+
+
/**
* 鑾峰彇鍔ㄦ�佸垪琛�
*
@@ -67,13 +71,20 @@
if (subId != null && subId == 0)
subId = null;
- List<DaTaoKeDetail> detailList = null;
+ List<DaTaoKeDetailV2> detailList = null;
if (cid == 1) {
- detailList = daTaoKeGoodsService.getCurrentHotSalesRankGoodsList();
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_HOT, null);
+ if (result != null)
+ detailList = result.getGoodsList();
+
} else if (cid == 2) {
- detailList = daTaoKeGoodsService.getCurrentSalesRankGoodsList(subId);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_TIME, subId);
+ if (result != null)
+ detailList = result.getGoodsList();
} else {
- detailList = daTaoKeGoodsService.getCurrentDaySalesRankGoodsList(subId);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getRankingList(DaTaoKeApiUtil.RANK_TYPE_DAY, subId);
+ if (result != null)
+ detailList = result.getGoodsList();
}
if (detailList == null)
@@ -84,9 +95,9 @@
List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
if (detailList != null) {
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
- for (DaTaoKeDetail detail : detailList) {
+ for (DaTaoKeDetailV2 detail : detailList) {
TaoBaoGoodsBrief taoBaoGoodsBrief = TaoBaoUtil.convert(detail);
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
if (cid == 2)
@@ -98,7 +109,6 @@
list.add(detailVO);
}
}
-
LogHelper.test("鏈�缁堝晢鍝佹暟鎹�:" + list.size());
JSONObject data = new JSONObject();
data.put("count", detailList.size());
--
Gitblit v1.8.0