From 4ce64cfcc457ca93dfc19960e89def4d07433c14 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 八月 2019 14:33:45 +0800
Subject: [PATCH] 用户查询订单修改
---
fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
index f2a129a..e087614 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
@@ -50,9 +50,9 @@
* @param out
*/
@RequestMapping(value = "listPreGoods", method = RequestMethod.GET)
- public void listPreGoods(String callback, AcceptData acceptData, String kw, PrintWriter out) {
+ public void listPreGoods(String callback, AcceptData acceptData, String kw, Integer page, PrintWriter out) {
// 澶ф窐瀹㈡暟鎹紝鏇存柊
- List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods();
+ List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods(page);
JSONArray array = new JSONArray();
Gson gson = new Gson();
for (TaoBaoGoodsBrief goods : list) {
@@ -89,8 +89,7 @@
if (goods != null && goods.getCouponAmount() != null
&& goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {
- if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())
- .compareTo(new BigDecimal("734")) >= 0) {
+ if (TaoBaoUtil.canAddToTLJBuyGoods(goods)) {
count++;
goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
@@ -116,10 +115,11 @@
// 鏈�澶�30涓晢鍝�
List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day, 30);
- BigDecimal rate = hongBaoManageService.getFanLiRate();
JSONArray array = new JSONArray();
for (ShareHotGoods sh : listGoods) {
- TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(), rate + "", null);
+ TaoBaoGoodsBriefExtra item = TaoBaoUtil.getTaoBaoGoodsBriefExtra(sh.getGoods(), 100 + "", null);
+ if (!StringUtil.isNullOrEmpty(item.getPictUrlWhite()))
+ item.setPictUrl(item.getPictUrlWhite());
item.setAuctionUrl(sh.getId());
array.add(item);
}
--
Gitblit v1.8.0