From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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 3f4ded1..083351d 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
@@ -18,9 +18,10 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -32,7 +33,7 @@
public class ShareHotGoodsController {
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private ShareHotGoodsService shareHotGoodsService;
@@ -49,16 +50,20 @@
* @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();
- BigDecimal rate = hongBaoManageService.getFanLiRate();
+ List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods(page);
JSONArray array = new JSONArray();
Gson gson = new Gson();
for (TaoBaoGoodsBrief goods : list) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
}
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
+
+
+
+
+
}
/**
@@ -70,11 +75,13 @@
* @param out
*/
@RequestMapping(value = "setShareGoods", method = RequestMethod.GET)
- public void setShareGoods(String callback, AcceptData acceptData, String ids, PrintWriter out) {
+ public void setShareGoods(String callback, AcceptData acceptData, String ids, String day, PrintWriter out) {
// 澶ф窐瀹㈡暟鎹紝鏇存柊
JSONArray array = JSONArray.fromObject(ids);
- String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ if (StringUtil.isNullOrEmpty(day)) {
+ day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ }
int count = 0;
for (int i = 0; i < array.size(); i++) {
// 鑾峰彇鍟嗗搧璇︽儏
@@ -87,10 +94,9 @@
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);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();
shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
}
}
@@ -108,11 +114,17 @@
*/
@RequestMapping(value = "listSelectedGoods", method = RequestMethod.GET)
public void listSelectedGoods(String callback, AcceptData acceptData, String day, PrintWriter out) {
- List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day);
- BigDecimal rate = hongBaoManageService.getFanLiRate();
+ if (StringUtil.isNullOrEmpty(day)) {
+ day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ }
+
+ // 鏈�澶�30涓晢鍝�
+ List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day, 30);
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