From 2147d023563a7c9d05d97547c00d6b0162c0644c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 十一月 2020 18:37:24 +0800
Subject: [PATCH] 刷单风险规则优化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java
index f4fd444..ad2091c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/jd/JDGoodsServiceImpl.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,11 +18,12 @@
 import com.yeshi.fanli.dto.jd.JDSearchResult;
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.exception.jd.JDGoodsException;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.jd.JDGoodsService;
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.jd.JDApiUtil;
@@ -87,7 +89,7 @@
 	@Cacheable(value = "jdSpecialCache", key = "'specialSearch-'+#page+'-'+#cid")
 	@Override
 	@Transactional(rollbackFor=Exception.class)
-	public List<JDGoods> specialSearch(Integer page, Long cid) throws JDGoodsException {
+	public List<JDGoods> specialSearch(Integer page, Long cid,SystemEnum system) throws JDGoodsException {
 		if (cid == null) {
 			throw new JDGoodsException(1, "鍒嗙被id涓虹┖");
 		}
@@ -149,7 +151,7 @@
 		}
 
 		if (!jdcid.contains(",")) {
-			return search(page, Constant.PAGE_SIZE, jdcid);
+			return search(page, Constant.PAGE_SIZE, jdcid,system);
 		}
 
 		// 澶氫釜鍒嗙被id澶勭悊
@@ -159,7 +161,7 @@
 			if (i >= 3) {
 				break;
 			}
-			List<JDGoods> listGoods = search(page, 10, arrayId[i]);
+			List<JDGoods> listGoods = search(page, 10, arrayId[i],system);
 			if (listGoods != null && listGoods.size() > 0) {
 				list.addAll(listGoods);
 			}
@@ -184,9 +186,9 @@
 		return goodsList;
 	}
 
-	private List<JDGoods> search(int page, int pageSize, String jdcid) {
+	private List<JDGoods> search(int page, int pageSize, String jdcid, SystemEnum system) {
 		JDSearchResult result = null;
-		String way = configService.get("jd_api_search_key");
+		String way = configService.getValue(ConfigKeyEnum.jdApiSearchKey.getKey(),system);
 		if ("1".equals(way)) { // API鎼滅储
 			JDFilter filterAPI = new JDFilter();
 			filterAPI.setPageIndex(page);
@@ -210,9 +212,9 @@
 
 	@Cacheable(value = "jdCache", key = "'getIndexJDGoods-'+#page")
 	@Override
-	public JDSearchResult getIndexJDGoods(int page) {
+	public JDSearchResult getIndexJDGoods(int page,SystemEnum system) {
 		JDSearchResult result = null;
-		String way = configService.get("jd_api_search_key");
+		String way = configService.getValue(ConfigKeyEnum.jdApiSearchKey.getKey(),system);
 		// TODO 闇�瑕佽皟鏁磋鍒�
 		way = "0";
 		if ("1".equals(way)) {
@@ -225,7 +227,7 @@
 			JDSearchFilter jdfilter = new JDSearchFilter();
 			jdfilter.setPageNo(page);
 			jdfilter.setPageSize(Constant.PAGE_SIZE);
-			result =JDApiUtil.getJingFenGoods(page,15); //JDUtil.searchByKey(jdfilter);
+			result =JDApiUtil.getJingFenGoods(page,125); //JDUtil.searchByKey(jdfilter);
 		}
 		if (result != null && result.getGoodsList() != null)
 			Collections.shuffle(result.getGoodsList());

--
Gitblit v1.8.0