From be44007f1ffdd4d391fd360dce24a3423e37bcc6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 七月 2019 15:29:11 +0800
Subject: [PATCH] 修复订单异常处理中产生的bug

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 47c1d4c..864f8da 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
@@ -112,6 +112,8 @@
 			navList = getCommonNav();
 		} else if (type == CommonContentTypeEnum.qiCheHuWai) {
 			navList = getCommonNav();
+		} else if (type == CommonContentTypeEnum.chaoPinReMai) {
+			navList = getCommonNav();
 		}
 
 		return navList;
@@ -262,7 +264,7 @@
 		if ("1".equalsIgnoreCase(cid)) {// 澶ф窐瀹㈡暟鎹�
 			List<Integer> cidList = new ArrayList<>();
 			cidList.add(2);// 姣嶅┐
-			result = DaTaoKeApiUtil.search("", null, null, null, page, pageSize, DaTaoKeApiUtil.SORT_DEFAULT);
+			result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, DaTaoKeApiUtil.SORT_DEFAULT);
 			List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 			long count = 0;
 			if (result != null) {
@@ -470,7 +472,7 @@
 		cidList.add(7);
 		cidList.add(13);
 		int sort = getCommonSort(cid);
-		result = DaTaoKeApiUtil.search("", null, null, null, page, pageSize, sort);
+		result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
 		DaTaoKeGoodsResult result1 = DaTaoKeApiUtil.search("杩愬姩 鐢�", cidList, null, null, page, pageSize, sort);
 		List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
 		long count = 0;

--
Gitblit v1.8.0