From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/web/TLJBuyGoodsController.java | 10 ++++++----
1 files changed, 6 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..1254a01 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
@@ -91,10 +91,11 @@
.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));
+ new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount),
+ TaoBaoConstant.ownBuyApp);
}
}
}
@@ -119,7 +120,8 @@
List<TLJBuyGoods> listGoods = tljBuyGoodsService.listByDay(day, 30);
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