Merge remote-tracking branch 'origin/master'

yujian

2019-05-20 0a51e12c7a0a4ce201d5ba8459d702d029beea19

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -1734,6 +1734,13 @@
        root.put("endTime", endTime > 0? endTime : 0);

        root.put("listgoods", array);



		
        JSONObject params = new JSONObject();

        params.put("url", configService.get("spike_goods_link"));

        JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");

        root.put("params", params);

        root.put("jumpDetail", jumpDetail);



        return root;

    }



@@ -1745,13 +1752,7 @@
     */

    @RequestMapping(value = "getSpikeGoods")

    public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {

        JSONObject params = new JSONObject();

        params.put("url", configService.get("spike_goods_link"));

        JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");

		
        JSONObject root = getSpikeGoodsContent(acceptData);

        root.put("params", params);

        root.put("jumpDetail", jumpDetail);

        out.print(JsonUtil.loadTrueResult(root));

    }