Merge remote-tracking branch 'origin/master'

admin

2019-03-01 ba2555b05fcfaacd8c10bbe2cdf3d7e323566871

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java

@@ -443,6 +443,10 @@
            }

            

            String params = record.getParams();

            if (params != null && params.trim().length() == 0) {

                params = null;

            }

			
            if (!StringUtil.isNullOrEmpty(params)) {

                

                String jumpValue = systemConfigService.get("jump");

@@ -451,17 +455,32 @@
                }

                

                params = jumpValue.replace("#", params);

                record.setParams(params);

            }

            

            if (!StringUtil.isNullOrEmpty(jumpType)) {

                List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);

                if (listByType !=null && listByType.size() > 0) {

                    record.setJumpDetail(listByType.get(0));

                    resultObj.setJumpDetail(listByType.get(0));

                } 

            }

            

            specialService.updateByPrimaryKeySelective(record);

			
            String name = record.getName();

            if (name != null && name.trim().length() == 0) {

                name = null;

            }

			
            String remark = record.getRemark();

            if (remark != null && remark.trim().length() == 0) {

                remark = null;

            }

			
            resultObj.setName(name);

            resultObj.setParams(params);

            resultObj.setShowType(record.getShowType());

            resultObj.setRemark(remark);

			
            specialService.updateByPrimaryKey(resultObj);

            

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

            


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

@@ -2258,40 +2258,14 @@
            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);



                    JumpDetailV2 jumpDetail = special.getJumpDetail();

                    if (jumpDetail != null) {

                        jumpDetail.setId(null);

                        jumpDetail.setName(null);

                    }

                    // 邀请登陆验证

                    if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()

                            && uid != null) {

						
                        UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

                        if (userInfoExtra != null && userInfoExtra.getInviteCode() != null

                                && userInfoExtra.getInviteCode().trim().length() > 0) {

							
                            JSONObject params = new JSONObject();

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

                            special.setParams(params.toString());

                        }

                    }

                }

            if (listSpecial == null) {

                listSpecial = new ArrayList<Special>();

            }



            JSONObject root = new JSONObject();

            root.put("special", listSpecial);



            root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));

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

			
        } catch (Exception e) {

            e.printStackTrace();

        }


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

@@ -13,6 +13,7 @@
import javax.persistence.ManyToOne;

import javax.persistence.Table;



import com.google.gson.annotations.Expose;

import com.yeshi.fanli.entity.common.JumpDetailV2;



/**

@@ -36,6 +37,7 @@
    private Long id;



    // 名称

    @Expose

    @JoinColumn(name = "b_name")

    @org.yeshi.utils.mybatis.Column(name = "b_name")

    private String name;

@@ -46,28 +48,33 @@
    private String card;



    // 标识管理id

    @Expose

    @JoinColumn(name = "b_card_id")

    @org.yeshi.utils.mybatis.Column(name = "b_card_id")

    private Long cardId;

    

        

    // 主图

    @Expose

    @JoinColumn(name = "b_main_picture")

    @org.yeshi.utils.mybatis.Column(name = "b_main_picture")

    private String picture;

    

    // 附图

    @Expose

    @JoinColumn(name = "b_sub_picture")

    @org.yeshi.utils.mybatis.Column(name = "b_sub_picture")

    private String subPicture;



    // 跳转详情

    @Expose

    @ManyToOne(fetch = FetchType.EAGER)

    @JoinColumn(name = "b_jumpid")

    @org.yeshi.utils.mybatis.Column(name = "b_jumpid")

    private JumpDetailV2 jumpDetail;



    // 跳转参数

    @Expose

    @JoinColumn(name = "b_params")

    @org.yeshi.utils.mybatis.Column(name = "b_params")

    private String params;

@@ -83,6 +90,7 @@
    private Long state;

    

    // 显示类型

    @Expose

    @JoinColumn(name = "b_show_type")

    @org.yeshi.utils.mybatis.Column(name = "b_show_type")

    private String showType;


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

@@ -113,7 +113,6 @@


    

    @Override

    @Cacheable(value = "configCache", key = "'listPageBySystemAndCard-'+#card+'-'+#systemId+'-'+#start +'-'+#count")

    public List<Special> listPageBySystemAndCard(long start, int count, String card, Long systemId) {

        return specialMapper.listPageBySystemAndCard(start, count, card, systemId);

    }