yujian
2019-06-25 bcbd93bb2239423aecba4e93ffba2e96ab873390
Merge remote-tracking branch 'origin/master' into div

Conflicts:
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
1个文件已修改
16 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java
@@ -365,7 +365,12 @@
        // 首页-5圆形2排区域
        JSONObject arcMap = new JSONObject();
        List<Special> listArc = specialMapper.listByPlaceKey("index_arc", sex);
        String indexArc = "index_arc";
        if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
            indexArc = "index_arc_1.5.6";
        List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex);
        if (listArc == null) {
            listArc = new ArrayList<Special>();
        } else if (listArc.size() > 0) {
@@ -377,7 +382,8 @@
        }
        // 处理9.9包邮
        if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())&&!Constant.IS_TEST)
        if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())
                && !Constant.IS_TEST)
            for (Special s : listArc) {
                if (s.getName().contains("9.9")) {// 9块9
                    s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));
@@ -417,8 +423,12 @@
        activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));
        // 首页-方形专题(品牌券、母婴...)
        String indexBlock = "index_block";
        if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
            indexBlock = "index_block_1.5.6";
        JSONObject blockJsonMap = new JSONObject();
        List<Special> listBlock = specialMapper.listByPlaceKey("index_block", sex);
        List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex);
        if (listBlock == null) {
            listBlock = new ArrayList<Special>();
        } else if (listBlock.size() > 0) {