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/service/impl/taobao/TLJBuyGoodsServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 37 insertions(+), 19 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java index 61d3ec9..fbcecc4 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJBuyGoodsServiceImpl.java @@ -2,6 +2,7 @@ import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -17,13 +18,14 @@ import com.yeshi.fanli.dto.taobao.TaoLiJinDTO; 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.entity.taobao.dataoke.DaTaoKeDetailV2; import com.yeshi.fanli.exception.taobao.TaoKeApiException; -import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService; import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService; +import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService; import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service; import com.yeshi.fanli.util.StringUtil; @@ -52,6 +54,9 @@ @Resource private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService; + @Resource + private TaoBaoUnionConfigService taoBaoUnionConfigService; + @Override public void addTLJBuyGoods(TLJBuyGoods goods, TaoKeAppInfo taoKeAppInfo) { if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null) @@ -64,33 +69,45 @@ tljBuyGoodsDao.save(goods); } + @Override + public void addTLJBuyGoods(TLJBuyGoods goods) { + List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService + .getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY); + + for (TaoBaoUnionConfig app : configList) { + long count = tljBuyGoodsDao.countByDayAndAppKey(app.getAppKey(), goods.getDay()); + if (count < 12) { + addTLJBuyGoods(goods, new TaoKeAppInfo(app.getAppKey(), app.getAppSecret(), app.getDefaultPid())); + break; + } + } + } + @Cacheable(value = "commonContentCache", key = "'tljBuy-listByDay'+#day") @Override public List<TLJBuyGoods> listByDay(String day) { - List<TLJBuyGoods> list = listByDay(day, 10); - // if (list.size() <= 10) - // return list; - // else { - // List<TLJBuyGoods> newList = new ArrayList<>(); - // for (int i = 0; i < 10; i++) { - // newList.add(list.get(i)); - // } - // return newList; - // } - - return list; + List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService + .getConfigByTypeCache(TaoBaoUnionConfig.TYPE_TLJ_BUY); + List<TLJBuyGoods> goodsList = new ArrayList<>(); + for (TaoBaoUnionConfig appInfo : configList) { + List<TLJBuyGoods> list = listByDay(appInfo.getAppKey(), day, 10); + if (list != null && list.size() > 0) + goodsList.addAll(list); + } + Collections.shuffle(goodsList); + return goodsList; } @Override - public List<TLJBuyGoods> listByDay(String day, int count) { - List<TLJBuyGoods> list = tljBuyGoodsDao.listByDayOrderByUpdateTime(day, 1, count); + public List<TLJBuyGoods> listByDay(String appKey, String day, int count) { + List<TLJBuyGoods> list = tljBuyGoodsDao.listByDayOrderByUpdateTime(appKey, day, 1, count); List<TaoBaoGoodsBrief> goodsList = new ArrayList<>(); if (list != null) { for (TLJBuyGoods shg : list) goodsList.add(shg.getGoods()); } - //杩囨护鍩烘湰鍟嗗搧淇℃伅 - goodsList=taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList); + // 杩囨护鍩烘湰鍟嗗搧淇℃伅 + goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList); // 杩囨护涓嬬嚎鍟嗗搧 goodsList = taoBaoGoodsBriefService.filterOffLineGoods(goodsList); // 娣诲姞澶ф窐瀹俊鎭� @@ -140,12 +157,12 @@ } @Override - public boolean verifyCanCreateTLJ(Long auctionId) { + public boolean verifyCanCreateTLJ(Long auctionId,TaoKeAppInfo app) { TaoLiJinDTO taoLiJinDTO = null; try { taoLiJinDTO = TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲戦獙璇�", new BigDecimal("1.00"), 1, new Date(), new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), new Date(), - new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), TaoBaoConstant.ownBuyApp); + new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 6), app); } catch (TaoKeApiException e) { if (e.getCode() == TaoKeApiException.CODE_TLJ_FORBIDDEN) { // 璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖� @@ -226,4 +243,5 @@ public TLJBuyGoods selectByAuctionIdAndDay(Long auctionId, String day) { return tljBuyGoodsDao.selectByAuctionIdAndDay(auctionId, day); } + } \ No newline at end of file -- Gitblit v1.8.0