From 7abe4e6827998c56fafe53679addc5d78c6e45c0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 十月 2019 11:35:00 +0800
Subject: [PATCH] 同店铺订单,同商品订单高危标识添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
index 665c512..e8a3497 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/CommonContentControllerV2.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -26,16 +27,18 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;
import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
@@ -136,16 +139,24 @@
}
private void getListTB(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
- CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
- cid, page, Constant.PAGE_SIZE);
-
- // 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
- List<SwiperPicture> bannerList = new ArrayList<>();
+ CommonContentResult result = null;
+ CommonContentTypeEnum type = CommonContentTypeEnum.valueOf(key);
+ if (type == CommonContentTypeEnum.guessLikeDevice) {
+ // 鐚滀綘鍠滄
+ String idfa = acceptData.getIdfa();
+ String imei = acceptData.getImei();
+ result = guessLikeDeviceTB(idfa, imei, page);
+ } else {
+ result = commonTemplateContentService.getContentList(type, cid, page, Constant.PAGE_SIZE);
+ }
JSONObject root = new JSONObject();
- if (page == 1)
+ if (page == 1) {
+ // 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
+ List<SwiperPicture> bannerList = new ArrayList<>();
root.put("bannerList", new Gson().toJson(bannerList));
-
+ }
+
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
@@ -154,7 +165,7 @@
for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
- if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
+ if (type == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
{
vo.getMoneyInfo().setFanliMoney("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
vo.getMoneyInfo().setShareMoney("楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief));
@@ -259,5 +270,25 @@
data.put("count", count);
out.print(JsonUtil.loadTrueResult(data));
}
+
+
+ /**
+ * 鐚滀綘鍠滄-娣樺疂璁惧鎺ㄨ崘
+ * @param acceptData
+ * @param page
+ * @return
+ */
+ @Cacheable(value = "commonContentCache", key = "#idfa+'-'+#imei+'-'+#page")
+ private CommonContentResult guessLikeDeviceTB(String idfa, String imei, Integer page) {
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa);
+ if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
+ && searchResult.getTaoBaoGoodsBriefs().size() > 0) {
+ CommonContentResult result = new CommonContentResult();
+ result.setCount(searchResult.getPageEntity().getTotalCount());
+ result.setGoodsList(searchResult.getTaoBaoGoodsBriefs());
+ return result;
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0