From e265881fa0d83b8767cadf7b1c83c71b80b5bb6d Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 17 十二月 2019 10:39:24 +0800 Subject: [PATCH] 隐藏好店 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 47 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 13 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 df8b079..d0f4319 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 @@ -45,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; @@ -309,7 +310,7 @@ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); BigDecimal shareRate = hongBaoManageService.getShareRate(); - ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE); + ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate()); // 鍟嗗搧淇℃伅杩囨护 listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief); @@ -351,11 +352,17 @@ */ @RequestMapping(value = "getList", method = RequestMethod.POST) public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) { - if (Constant.IS_TEST) { - getListV3(acceptData, page, cid, uid, out); - return; + 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("椤电爜涓嶆纭�")); @@ -400,9 +407,16 @@ @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST) public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) { - if (Constant.IS_TEST) { - getShopInfoV3(acceptData, page, id, uid, out); - return; + 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) { @@ -521,7 +535,7 @@ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); BigDecimal shareRate = hongBaoManageService.getShareRate(); - ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE); + ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate()); // 鍟嗗搧淇℃伅杩囨护 listGoodsBrief = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(listGoodsBrief); @@ -563,9 +577,16 @@ */ @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST) public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) { - if (Constant.IS_TEST) { - getHistoryV3(acceptData, page, uid, type, out); - return; + 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) { @@ -698,7 +719,7 @@ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); - ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE); + ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, hongBaoManageService.getVIPFanLiRate()); JSONArray array = new JSONArray(); List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId((page - 1) * 50, 50,id); -- Gitblit v1.8.0