From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 c156419..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;
/**
* 鎷夊彇澶囬�夊晢鍝�
@@ -116,10 +123,20 @@
}
// 鏈�澶�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(), TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);
+ TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);
if (!StringUtil.isNullOrEmpty(item.getPictUrlWhite()))
item.setPictUrl(item.getPictUrlWhite());
item.setAuctionUrl(sh.getId());
--
Gitblit v1.8.0