From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 a407466..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
@@ -3,6 +3,7 @@
 import java.io.PrintWriter;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -173,7 +174,8 @@
 				picList = new ArrayList<SwiperPicture>();
 			}
 
-			List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1);
+			List<GoodsSubClass> goodsSubClassList = goodsSubClassService.getSubClassCache(gcid, 1,
+					Calendar.getInstance().get(Calendar.MONTH) + 1);
 			if (goodsSubClassList == null) {
 				goodsSubClassList = new ArrayList<GoodsSubClass>();
 			}
@@ -664,6 +666,7 @@
 		GoodsClass goodsClass = goodsClassService.getGoodsClassCache(gcid);
 		if (goodsClass == null) {
 			out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鍒嗙被"));
+			return;
 		}
 
 		if (page < 1)
@@ -676,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;
@@ -824,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