From ff58896fa6d75b17499923d1926169795bf95bdf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 12:24:30 +0800
Subject: [PATCH] 分享h5接口兼容 京东+拼多多
---
fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 c55a67c..95a0dc6 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
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.ShareHotGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -20,6 +21,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+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;
@@ -48,25 +50,15 @@
* @param out
*/
@RequestMapping(value = "listPreGoods", method = RequestMethod.GET)
- public void getSugguestSearch(String callback, AcceptData acceptData, String kw, PrintWriter out) {
+ public void listPreGoods(String callback, AcceptData acceptData, String kw, Integer page, PrintWriter out) {
// 澶ф窐瀹㈡暟鎹紝鏇存柊
-
- List<String> list = TaoBaoUtil.getSuguestSearch(kw);
- if (list != null && list.size() > 0) {
- JSONArray array = new JSONArray();
- int num = 0;
- for (String st : list) {
- array.add(st);
- num = num + 1;
- if (num >= 5) {
- break;
- }
- }
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
- } else {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));
+ 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, "100", null)));
}
- return;
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
}
/**
@@ -78,11 +70,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++) {
// 鑾峰彇鍟嗗搧璇︽儏
@@ -92,10 +86,15 @@
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
- if (goods != null) {
- count++;
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
- shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
+ 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) {
+ count++;
+ goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
+ }
}
}
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("璁剧疆鎴愬姛:" + count)));
@@ -111,11 +110,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