From a4cc097c7a5bd6a0b8397fb232484df9e01ed4f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 七月 2019 17:05:50 +0800
Subject: [PATCH] 解决1.5.7产生的bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HotSellController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HotSellController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HotSellController.java
index 753a870..b69fa15 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HotSellController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HotSellController.java
@@ -12,15 +12,18 @@
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.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
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.taobao.DaTaoKeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -96,13 +99,20 @@
subId = null;
TaoBaoGoodsBriefExtra goods = 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)
@@ -113,7 +123,7 @@
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
BigDecimal proportion = hongBaoManageService.getFanLiRate();
if (detailList != null)
- for (DaTaoKeDetail detail : detailList) {
+ for (DaTaoKeDetailV2 detail : detailList) {
goods = TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail), proportion.toString(),
null);
if (cid == 2)
@@ -124,7 +134,7 @@
goods.setSalesType(1);
list.add(goods);
}
-
+
LogHelper.test("鏈�缁堝晢鍝佹暟鎹�:" + list.size());
JSONObject data = new JSONObject();
data.put("count", detailList.size());
--
Gitblit v1.8.0