From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug,分享爆款自购修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
index 1cbcfc3..13e3adf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
@@ -9,11 +9,10 @@
 
 import javax.annotation.Resource;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -31,8 +30,9 @@
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 @Service
 public class TaoKeGoodsServiceImpl implements TaoKeGoodsService {
@@ -77,8 +77,6 @@
 		JSONArray arrayGoods = new JSONArray();
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
-		Map<String, String> map = manageService.convertMap();
 
 		BigDecimal proportion = manageService.getFanLiRate();
 
@@ -207,7 +205,6 @@
 		int fh = sf.getHongbao();
 		boolean ft = sf.isTmall();
 
-		Map<String, String> map = manageService.convertMap();
 		BigDecimal proportion = manageService.getFanLiRate();
 
 		if (fq == 0 && fh == 0 && !ft) {
@@ -219,7 +216,7 @@
 					if (!StringUtil.isNullOrEmpty(startBiz30day)) {
 						int biz30day = Integer.parseInt(startBiz30day);
 						if (count < biz30day) {
-							break;
+							continue;
 						}
 					}
 
@@ -272,6 +269,8 @@
 
 		return data;
 	}
+	
+	
 
 	@Override
 	@Cacheable(value = "searchWuLiaoCache", key = "'searchWuLiaoList-'+#sf")

--
Gitblit v1.8.0