yujian
2019-03-01 d9eedc7e73c57aaef7bb8b3512f960884f91fd45
专题返回参数优化
2个文件已修改
41 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -2258,43 +2258,12 @@
            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) {
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;