From 3ce9e928e082ff8abf697dba560cbfbb412e89f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 15:45:02 +0800
Subject: [PATCH] 商城后台编辑
---
fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 97c43d3..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;
/**
* 鎷夊彇澶囬�夊晢鍝�
@@ -91,8 +98,8 @@
.compareTo(new BigDecimal("143")) >= 0) {
count++;
goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
- int totalHongBaoCount = 200 + (int) (Math.random() * 800);
- int leftHongBaoCount = 20 + (int) (Math.random() * 200);
+ 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));
}
@@ -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