From f111025b1c2c8bb95e64f4f9e23c09813b7938d2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 十二月 2019 10:53:30 +0800
Subject: [PATCH] 维权日志添加，京东短链解析添加缓存
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 90 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index bbbd733..50a59ae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -14,6 +14,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.brand.BrandGoodsCahe;
@@ -44,6 +45,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -109,7 +111,7 @@
if (page == null || page < 1) {
page = 1;
}
- JSONObject data = brandClassShopService.listEffectiveCacheV2(page, cid);
+ JSONObject data = brandClassShopService.listEffectiveCacheV2(page, cid,acceptData.getPlatform(),acceptData.getVersion());
out.print(JsonUtil.loadTrueResult(data));
}
@@ -306,9 +308,8 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
// 鍟嗗搧淇℃伅杩囨护
listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
@@ -327,8 +328,7 @@
continue;
}
}
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -349,8 +349,20 @@
* @param acceptData
* @param out
*/
-// @RequestMapping(value = "getList", method = RequestMethod.POST)
+ @RequestMapping(value = "getList", method = RequestMethod.POST)
public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ getListV3(acceptData, page, cid, uid, out);
+ return;
+ }
+ } else {
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ getListV3(acceptData, page, cid, uid, out);
+ return;
+ }
+ }
+
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
return;
@@ -371,7 +383,7 @@
long count = brandInfoService.countBrandInfo(cid);
- List<BrandInfoVO> list = brandInfoService.listBrandInfoCache((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid);
+ List<BrandInfoVO> list = brandInfoService.listBrandInfoCache((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid,acceptData.getPlatform(),acceptData.getVersion());
if (list == null)
list = new ArrayList<BrandInfoVO>();
@@ -391,8 +403,20 @@
* @param acceptData
* @param out
*/
-// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
+ @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
+
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ getShopInfoV3(acceptData, page, id, uid, out);
+ return;
+ }
+ } else {
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ getShopInfoV3(acceptData, page, id, uid, out);
+ return;
+ }
+ }
if (id == null) {
out.print(JsonUtil.loadFalseResult("缂哄け搴楅摵id"));
@@ -405,7 +429,7 @@
JSONObject data = new JSONObject();
if (page == 1) {
// 2銆侀《閮ㄨ疆鎾浘
- List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("brand_picture");
+ List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("brand_picture",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (oldtopPicList != null && oldtopPicList.size() > 0)
topPicList.addAll(oldtopPicList);
TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(id);
@@ -508,9 +532,8 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
// 鍟嗗搧淇℃伅杩囨护
listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief);
@@ -529,8 +552,7 @@
continue;
}
}
- GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,
- shareRate);
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
array.add(gson.toJson(goodsDetailVO));
}
}
@@ -551,8 +573,20 @@
* 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
-// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
+ @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ getHistoryV3(acceptData, page, uid, type, out);
+ return;
+ }
+ } else {
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ getHistoryV3(acceptData, page, uid, type, out);
+ return;
+ }
+ }
+
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
return;
@@ -623,7 +657,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getList", method = RequestMethod.POST)
+// @RequestMapping(value = "getList", method = RequestMethod.POST)
public void getListV3(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
@@ -645,7 +679,7 @@
long count = brandInfoService.countValidByCidToApp(cid);
- List<BrandInfoVO> list = brandInfoService.listValidToApp((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid);
+ List<BrandInfoVO> list = brandInfoService.listValidToApp((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, cid,acceptData.getPlatform(),acceptData.getVersion());
if (list == null)
list = new ArrayList<BrandInfoVO>();
@@ -666,7 +700,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
+// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV3(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
if (id == null) {
out.print(JsonUtil.loadFalseResult("缂哄け搴楅摵id"));
@@ -678,29 +712,31 @@
brandInfoRecordService.addRecord(id, uid, acceptData.getDevice());
}
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion());
JSONArray array = new JSONArray();
+
List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId((page - 1) * 50, 50,id);
for (BrandGoodsCahe brandGoods: listGoods) {
JDGoods goodsJD = brandGoods.getGoodsJD();
if (goodsJD != null) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goodsJD, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goodsJD, paramsDTO)));
continue;
}
TaoBaoGoodsBrief goodsTB = brandGoods.getGoodsTB();
if (goodsTB != null) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsTB, null, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertTaoBao(goodsTB, paramsDTO)));
continue;
}
PDDGoodsDetail goodsPDD = brandGoods.getGoodsPDD();
if (goodsPDD != null) {
- array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goodsPDD, fanLiRate, shareRate)));
+ array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goodsPDD, paramsDTO)));
continue;
}
}
@@ -709,7 +745,7 @@
if (page == 1 && array.size() > 0) {
// 2銆侀《閮ㄨ疆鎾浘
List<SwiperPicture> topPicList = new ArrayList<>();
- List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("brand_picture");
+ List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("brand_picture",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (oldtopPicList != null && oldtopPicList.size() > 0)
topPicList.addAll(oldtopPicList);
@@ -724,7 +760,7 @@
data.put("shopList", JsonUtil.getApiCommonGson().toJson(shopList));
}
- data.put("count", 50);
+ data.put("count", array.size());
data.put("list", array);
out.print(JsonUtil.loadTrueResult(data));
}
@@ -739,7 +775,7 @@
* 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
- @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
+// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV3(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
--
Gitblit v1.8.0