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/job/TaoLiJinJob.java |   58 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
index ac946ff..d4a207a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -13,11 +13,13 @@
 import com.yeshi.fanli.entity.taobao.ShareHotGoods;
 import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+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.log.LogHelper;
 import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
 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.service.inter.tlj.UserTaoLiJinReportService;
 import com.yeshi.fanli.util.Constant;
@@ -37,9 +39,12 @@
 
 	@Resource
 	private TLJBuyGoodsService tljBuyGoodsService;
-	
+
 	@Resource
 	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+
+	@Resource
+	private TaoBaoUnionConfigService taoBaoUnionConfigService;
 
 	/**
 	 * 鏇存柊鎶ュ憡
@@ -107,16 +112,19 @@
 			return;
 		LogHelper.test("楠岃瘉鑷喘绔嬪噺鍟嗗搧");
 		String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd");
-		List<TLJBuyGoods> list = tljBuyGoodsService.listByDay(day, 15);
-		int count = 0;
-		for (int i = 0; i < list.size(); i++) {
-			if (count >= 10)
-				break;
-			boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),
-					new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
-							TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
-			if (success) {
-				count++;
+		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService
+				.getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY);
+		for (TaoBaoUnionConfig app : configList) {
+			List<TLJBuyGoods> list = tljBuyGoodsService.listByDay(app.getAppKey(), day, 15);// 鑾峰彇鏈�澶�15涓晢鍝�
+			int count = 0;
+			for (int i = 0; i < list.size(); i++) {
+				if (count >= 10)
+					break;
+				boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),
+						new TaoKeAppInfo(app.getAppKey(), app.getAppSecret(), app.getDefaultPid()));
+				if (success) {
+					count++;
+				}
 			}
 		}
 	}
@@ -131,33 +139,16 @@
 			}
 			if (goods != null && goods.getCouponAmount() != null
 					&& goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {
-
 				if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())
 						.compareTo(new BigDecimal("143")) >= 0) {
 					goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
 					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));
+				}
 			}
 		}
-	}
-
-	/**
-	 * 姣忓ぉ鏅氫笂11鐐�50娣诲姞娣樼ぜ閲�1涓晢鍝侊紝鐢ㄤ簬鍏煎Android鍓嶇娌℃湁鍟嗗搧涓嶆樉绀篵anner鐨勯棶棰�
-	 */
-	@Scheduled(cron = "0 50 23 * * ? ")
-	public void autoAddTLJBuyGoods() {
-		if (!Constant.IS_TASK)
-			return;
-		String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
-		List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);
-		Collections.shuffle(list);
-		if (list.size() > 0)
-			list = list.subList(0, 1);
-		addTLJBuyGoods(list, day);
 	}
 
 	/**
@@ -170,8 +161,11 @@
 		String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd");
 		List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);
 		Collections.shuffle(list);
-		if (list.size() > 20)
-			list = list.subList(0, 20);
+		List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService
+				.getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY);
+
+		if (list.size() > 12 * configList.size())
+			list = list.subList(0, 12 * configList.size());
 		addTLJBuyGoods(list, day);
 	}
 

--
Gitblit v1.8.0