From 52ae4f687bd246d6b200ed8605ddcb4631f83b84 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 26 二月 2019 14:47:35 +0800 Subject: [PATCH] 推荐测试信息修改 --- fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java index d52211c..55654a9 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java @@ -102,6 +102,7 @@ import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.service.inter.user.UserCustomSettingsService; import com.yeshi.fanli.service.inter.user.UserGoodsStorageService; +import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; @@ -233,6 +234,9 @@ @Resource private ShareGoodsActivityOrderService shareGoodsActivityOrderService; + + @Resource + private UserInfoExtraService userInfoExtraService; @RequestMapping(value = "getrecommendsection") public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) { @@ -2214,4 +2218,58 @@ out.print(JsonUtil.loadTrueResult(data)); } + /** + * 娲诲姩鍒楄〃 + * + * @param acceptData + * @param out + */ + @RequestMapping(value = "getSpecialActivities") + public void getSpecialActivities(AcceptData acceptData, PrintWriter out) { + + System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages()); + if (system == null) { + out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�")); + return; + } + + try { + // 涓撻娲诲姩 + String specialCard = "special_activities"; + + List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard, + system.getId()); + + if (listSpecial != null && listSpecial.size() > 0) { + for (Special special : listSpecial) { + special.setCreatetime(null); + special.setUpdatetime(null); + special.setState(null); + special.setRemark(null); + special.setCard(null); + special.setCardId(null); + + // 鎵嬪姩鏇挎崲鍙傛暟 + if (special.getName() != null && special.getName().contains("閭�璇�")) { +// userInfoExtraService + + } + + JumpDetailV2 jumpDetail = special.getJumpDetail(); + if (jumpDetail != null) { + jumpDetail.setId(null); + jumpDetail.setName(null); + } + + } + } + + JSONObject root = new JSONObject(); + root.put("special", listSpecial); + + out.print(JsonUtil.loadTrueResult(root)); + } catch (Exception e) { + e.printStackTrace(); + } + } } -- Gitblit v1.8.0