From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 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 5666f37..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;
@@ -205,35 +201,35 @@
DaTaoKeGoodsResult result = null;
if ("-1".equalsIgnoreCase(cid)) {
- result = DaTaoKeApiUtil.search("", null, null, new BigDecimal("10"), page, pageSize,
+ result = DaTaoKeApiUtil.getGoodsList("", null, null, new BigDecimal("10"), null, page, pageSize,
DaTaoKeApiUtil.SORT_DEFAULT);
+
if (result == null || result.getGoodsList() == null || result.getGoodsList().size() == 0) {
result = new DaTaoKeGoodsResult();
- result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(null,
- new BigDecimal("10"),null, page, pageSize));
- result.setTotalCount(
- daTaoKeGoodsDetailV2Service.countByMaxPrice(null, new BigDecimal("10")));
+ result.setGoodsList(
+ daTaoKeGoodsDetailV2Service.listByMaxPrice(null, new BigDecimal("10"), null, page, pageSize));
+ result.setTotalCount(daTaoKeGoodsDetailV2Service.countByMaxPrice(null, new BigDecimal("10")));
}
} else if ("0".equalsIgnoreCase(cid)) {
- result = DaTaoKeApiUtil.search("", null, null, new BigDecimal("10"), page, pageSize,
+ result = DaTaoKeApiUtil.getGoodsList("", null, null, new BigDecimal("10"), null, page, pageSize,
DaTaoKeApiUtil.SORT_CREATETIME);
if (result == null || result.getGoodsList() == null || result.getGoodsList().size() == 0) {
result = new DaTaoKeGoodsResult();
- result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(null,
- new BigDecimal("10"),"createTime", page, pageSize));
- result.setTotalCount(
- daTaoKeGoodsDetailV2Service.countByMaxPrice(null, new BigDecimal("10")));
+ result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(null, new BigDecimal("10"), "createTime",
+ page, pageSize));
+ result.setTotalCount(daTaoKeGoodsDetailV2Service.countByMaxPrice(null, new BigDecimal("10")));
}
} else {
List<Integer> cidList = new ArrayList<>();
cidList.add(Integer.parseInt(cid));
- result = DaTaoKeApiUtil.search("", cidList, null, new BigDecimal("10"), page, pageSize,
+ 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();
result.setGoodsList(daTaoKeGoodsDetailV2Service.listByMaxPrice(Integer.parseInt(cid),
- new BigDecimal("10"),null, page, pageSize));
+ new BigDecimal("10"), null, page, pageSize));
result.setTotalCount(
daTaoKeGoodsDetailV2Service.countByMaxPrice(Integer.parseInt(cid), new BigDecimal("10")));
}
@@ -390,7 +386,7 @@
List<Integer> cidList = new ArrayList<>();
cidList.add(4);// 灞呭鐢熸椿
int sort = getCommonSort(cid);
- result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
+ result = DaTaoKeApiUtil.getGoodsList("", cidList, null, null, null, page, pageSize, sort);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
long count = 0;
if (result != null) {
@@ -415,7 +411,7 @@
List<Integer> cidList = new ArrayList<>();
cidList.add(6);// 缇庨
int sort = getCommonSort(cid);
- result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
+ result = DaTaoKeApiUtil.getGoodsList("", cidList, null, null, null, page, pageSize, sort);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
long count = 0;
if (result != null) {
@@ -464,7 +460,9 @@
if ("1".equalsIgnoreCase(cid)) {// 澶ф窐瀹㈡暟鎹�
List<Integer> cidList = new ArrayList<>();
cidList.add(2);// 姣嶅┐
- result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, DaTaoKeApiUtil.SORT_DEFAULT);
+ result = DaTaoKeApiUtil.getGoodsList("", cidList, null, null, null, page, pageSize,
+ DaTaoKeApiUtil.SORT_DEFAULT);
+
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
long count = 0;
if (result != null) {
@@ -512,7 +510,8 @@
List<Integer> cidList = new ArrayList<>();
cidList.add(1);// 濂宠
int sort = getCommonSort(cid);
- result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
+ result = DaTaoKeApiUtil.getGoodsList("", cidList, null, null, null, page, pageSize, sort);
+
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
long count = 0;
if (result != null) {
@@ -672,7 +671,7 @@
cidList.add(7);
cidList.add(13);
int sort = getCommonSort(cid);
- result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
+ result = DaTaoKeApiUtil.getGoodsList("", cidList, null, null, null, page, pageSize, sort);
DaTaoKeGoodsResult result1 = DaTaoKeApiUtil.search("杩愬姩 鐢�", cidList, null, null, page, pageSize, sort);
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
long count = 0;
@@ -721,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