From 37194e2d4b4ab85f7f29c1e900c406afe294579a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 13 八月 2019 12:17:48 +0800
Subject: [PATCH] 模拟请求缓存商品数据,淘礼金商品兼容多个appkey

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java
index 1254a01..0998e42 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java
@@ -2,6 +2,7 @@
 
 import java.io.PrintWriter;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -17,8 +18,11 @@
 import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
+import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TaoBaoConstant;
@@ -37,6 +41,9 @@
 
 	@Resource
 	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+	@Resource
+	private TaoBaoUnionConfigService taoBaoUnionConfigService;
 
 	/**
 	 * 鎷夊彇澶囬�夊晢鍝�
@@ -94,8 +101,7 @@
 					int totalHongBaoCount = 2000 + (int) (Math.random() * 8000);
 					int leftHongBaoCount = 200 + (int) (Math.random() * 2000);
 					tljBuyGoodsService.addTLJBuyGoods(
-							new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount),
-							TaoBaoConstant.ownBuyApp);
+							new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount));
 				}
 			}
 		}
@@ -117,7 +123,16 @@
 		}
 
 		// 鏈�澶�30涓晢鍝�
-		List<TLJBuyGoods> listGoods = tljBuyGoodsService.listByDay(day, 30);
+		List<TLJBuyGoods> listGoods = new ArrayList<>();
+		List<TaoBaoUnionConfig> coinfigList = taoBaoUnionConfigService
+				.getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY);
+		for (TaoBaoUnionConfig app : coinfigList) {
+			List<TLJBuyGoods> list = tljBuyGoodsService.listByDay(app.getAppKey(), day, 30);
+			if (list != null && list.size() > 0) {
+				listGoods.addAll(list);
+			}
+		}
+
 		JSONArray array = new JSONArray();
 		for (TLJBuyGoods sh : listGoods) {
 			TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(),

--
Gitblit v1.8.0