From c8f11c229b87d1652b6da0b15576c166cd51eb8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 14:25:22 +0800
Subject: [PATCH] 首页悬浮图mapperbug修改,增加商品详情中的比例展示

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsClassController.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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..d3026a5 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
@@ -43,12 +43,12 @@
 import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
 import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
 import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.lable.LabelClassService;
 import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
@@ -168,7 +168,8 @@
 			// 杞挱鍥�
 			List<SwiperPicture> picList = null;
 			if (swpid != null) {
-				picList = swiperPictureService.getByBannerId(swpid);
+				picList = swiperPictureService.getByBannerId(swpid, acceptData.getPlatform(),
+						Integer.parseInt(acceptData.getVersion()));
 			}
 			if (picList == null) {
 				picList = new ArrayList<SwiperPicture>();
@@ -679,7 +680,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 +828,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