From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
index 5c19911..f016c1f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java
@@ -29,7 +29,6 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.dataoke.DaTaoKeApiUtil;
@@ -39,9 +38,6 @@
@Service
public class CommonTemplateContentServiceImpl implements CommonTemplateContentService {
-
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@@ -227,9 +223,8 @@
} else {
List<Integer> cidList = new ArrayList<>();
cidList.add(Integer.parseInt(cid));
- result =
- DaTaoKeApiUtil.getGoodsList("", cidList, null, new BigDecimal("10"), null, page, pageSize,
- DaTaoKeApiUtil.SORT_DEFAULT);
+ result = DaTaoKeApiUtil.getGoodsList("", cidList, null, new BigDecimal("10"), null, page, pageSize,
+ DaTaoKeApiUtil.SORT_DEFAULT);
if (result == null || result.getGoodsList() == null || result.getGoodsList().size() == 0) {
result = new DaTaoKeGoodsResult();
@@ -725,8 +720,9 @@
e.printStackTrace();
}
Map<Long, TaoBaoGoodsBrief> goodsMap = new HashMap<>();
- for (TaoBaoGoodsBrief goods : listTaoKeGoods)
- goodsMap.put(goods.getAuctionId(), goods);
+ if (listTaoKeGoods != null)
+ for (TaoBaoGoodsBrief goods : listTaoKeGoods)
+ goodsMap.put(goods.getAuctionId(), goods);
for (int i = 0; i < goodsList.size(); i++) {
if (goodsMap.get(goodsList.get(i).getAuctionId()) == null) {
goodsList.remove(i--);
--
Gitblit v1.8.0