From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
index 9f474eb..beb02ce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java
@@ -679,7 +679,7 @@
long counttotal = 5000;
// 绮鹃�夊簱鏁版嵁涓虹┖鏃讹紝缃戠粶杩涜鏌ヨ
- if (listQuery == null || listQuery.size() == 0) {
+ if (listQuery == null || listQuery.size() == 0 || listQuery.size() < 10) {
long count = qualityGoodsService.countQueryClassId(gcid);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
page = page - totalPage;
@@ -827,9 +827,16 @@
meterialId = 0;
if (meterialId > 0)
result = TaoKeApiUtil.getMaterialByMaterialId(meterialId, page, 20);
- else
- result = TaoKeApiUtil.searchCouple(goodsClassService.getKeysById(id), null, page, 20);
+ else {
+ SearchFilter sf = new SearchFilter();
+ sf.setPage(page);
+ sf.setPageSize(20);
+ sf.setQuan(1);
+ sf.setKey(goodsClassService.getKeysById(id));
+ result = TaoKeApiUtil.searchWuLiao(sf);
+
+ }
List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();
if (result != null && result.getNavList() != null)
navList.addAll(result.getNavList());
--
Gitblit v1.8.0