加入是否新人弹框 + 淘礼金帮助链接调整

yujian

2019-06-26 71887083f013032c70741389b2842be2f4022023

加入是否新人弹框  + 淘礼金帮助链接调整

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java

@@ -394,7 +394,7 @@
            data.put("jumpName", "去使用");

            data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));

            data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));

            data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));

            

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

            return;

@@ -403,7 +403,6 @@
        

        // 登录用户

        JSONObject data = new JSONObject();

        data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));

        data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));

        

        if (type.equals(TaoLiJinOriginEnum.newbiesWin.name())) {

@@ -429,6 +428,7 @@
            data.put("jumpName", "去使用");

            data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

            data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));

            data.put("rules", configTaoLiJinService.getValueByKey("newbies_rules_link"));

            

        } else if(type.equals(TaoLiJinOriginEnum.rankWin.name())) {

            boolean isRank = false;

@@ -464,6 +464,7 @@
                data.put("jumpName", "去查看");

                data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("user_rank"));

                data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_not_enough_tip"));

                data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));

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

                return;

            } else {

@@ -475,6 +476,7 @@
                data.put("jumpName", "去使用");

                data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));

                data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));

                data.put("rules", configTaoLiJinService.getValueByKey("rank_rules_link"));

            }

            

        } else {


 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/FloatAD.java

@@ -80,7 +80,7 @@
    @Column(name = "fa_order")

    private Integer order;

    

    // 适用类型 1新人

    // 适用类型 ： 0通用  1新人

    @Column(name = "fa_type")

    private Integer type;




 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java

@@ -84,6 +84,12 @@
            picture = uploadPicture(file);

        }

        

        // 适用类型 ： 0通用  1新人

        Integer type = record.getType();

        if (type == null) {

            record.setType(0);

        }

		
        Long id = record.getId();

        if (id == null) {

            int maxOrder = floatADMapper.getMaxOrderByPosition(position);

@@ -93,10 +99,6 @@
                record.setState(0);

            }

            

            Integer type = record.getType();

            if (type == null) {

                record.setType(0);

            }

            record.setOrder(maxOrder + 1);

            record.setCreateTime(new Date());

            record.setUpdateTime(new Date());

@@ -117,7 +119,6 @@
                record.setPicture(resultObj.getPicture());

            }

            

            record.setType(resultObj.getType());

            record.setOrder(resultObj.getOrder());

            record.setCreateTime(resultObj.getCreateTime());

            record.setUpdateTime(new Date());