From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
index cf91a92..22cea11 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsServiceImpl.java
@@ -24,7 +24,6 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -43,8 +42,6 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@@ -79,7 +76,7 @@
for (int i = 0; i < list.size(); i++) {
// 杩囨护娣樼ぜ閲戝ぇ浜�10鍧楅挶鐨�
BigDecimal hongBao = TaoBaoUtil.getGoodsHongBaoMoney(list.get(i).getGoods(),
- TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);
if (hongBao.compareTo(new BigDecimal(10)) > 0) {
list.remove(i--);
}
@@ -114,7 +111,7 @@
// 杩囨护涓嬬嚎鍟嗗搧
goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList);
// 娣诲姞澶ф窐瀹俊鎭�
- goodsList = daTaoKeGoodsDetailService.filterTaoBaoGoods(goodsList);
+ goodsList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goodsList);
Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
if (goodsList != null)
@@ -164,7 +161,10 @@
public List<TaoBaoGoodsBrief> listPreGoods(String key ,int page) {
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
// 澶ф窐瀹㈢瓫閫夛細 鍒稿悗浠� 1-2鍖洪棿 銆佺患鍚堟帓搴�
- DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+// DaTaoKeGoodsResult result = DaTaoKeApiUtil.search(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+ DaTaoKeGoodsResult result = DaTaoKeApiUtil.getGoodsList(key, null, new BigDecimal(1), new BigDecimal(2), 1, page, 100, 0);
+
+
if (result != null && result.getGoodsList() != null) {
for (DaTaoKeDetailV2 v2 : result.getGoodsList())
goodsList.add(TaoBaoUtil.convert(v2));
--
Gitblit v1.8.0