yujian
2020-01-03 598d537f468c7c20a840c6ff8c9f742b6f542286
configKey枚举
3个文件已修改
1个文件已添加
207 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -108,6 +108,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FilePathEnum;
@@ -240,6 +241,9 @@
    @Resource
    private UserVIPInfoService userVIPInfoService;
    @Resource
    private UserVipConfigService userVipConfigService;
    
    @Resource
    private RedPackForbidService redPackForbidService;
@@ -2188,7 +2192,7 @@
            else
                data.put("invitCodeUpdated", false);
            data.put("welfareCenterNews", welfareCenterNews);// 福利中心消息
            data.put("vipLink", configService.get("vip_link"));// 超级会员升级链接
            data.put("vipLink", userVipConfigService.getValueByKey("vip_link"));// 超级会员升级链接
            // 2.0.1之后绑定手机号
            if (VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -70,6 +70,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -193,6 +194,10 @@
    @Resource
    private UserVIPInfoService userVIPInfoService;
    @Resource
    private UserVipConfigService userVipConfigService;
    /**
     * 淘宝商品详情
@@ -537,11 +542,11 @@
            if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
                params1.put("url", configService.get("special_guide_reward_coupon_link"));
            else
                params1.put("url", configService.get("vip_link"));
                params1.put("url", userVipConfigService.getValueByKey("vip_link"));
            rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
            if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
                rewardCoupon.setDesc("返");
                params1.put("url", configService.get("vip_link"));
                params1.put("url", userVipConfigService.getValueByKey("vip_link"));
                rewardCoupon.getJumpDetail().setNeedLogin(true);
            } else
                rewardCoupon.setDesc("用返利奖励券最高返");
@@ -674,12 +679,12 @@
        if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
            params1.put("url", configService.get("special_guide_reward_coupon_link"));
        else
            params1.put("url", configService.get("vip_link"));
            params1.put("url", userVipConfigService.getValueByKey("vip_link"));
        rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
        if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
            rewardCoupon.setDesc("返");
            params1.put("url", configService.get("vip_link"));
            params1.put("url", userVipConfigService.getValueByKey("vip_link"));
            rewardCoupon.getJumpDetail().setNeedLogin(true);
        } else {
            rewardCoupon.setDesc("用返利奖励券最高返");
@@ -839,12 +844,12 @@
        if (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion()))
            params1.put("url", configService.get("special_guide_reward_coupon_link"));
        else
            params1.put("url", configService.get("vip_link"));
            params1.put("url", userVipConfigService.getValueByKey("vip_link"));
        rewardCoupon.setMaxMoney(goodsDetail.getMoneyInfo().getMaxMoney());
        if (VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())) {
            rewardCoupon.setDesc("返");
            params1.put("url", configService.get("vip_link"));
            params1.put("url", userVipConfigService.getValueByKey("vip_link"));
            rewardCoupon.getJumpDetail().setNeedLogin(true);
        } else
            rewardCoupon.setDesc("用返利奖励券最高返");
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserController.java
@@ -36,6 +36,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -80,6 +81,10 @@
    @Resource
    private ConfigService configService;
    @Resource
    private UserVipConfigService userVipConfigService;
    /**
     * 获取openId
@@ -316,7 +321,7 @@
                data.put("invitCodeUpdated", true);// 邀请码是否已经修改过
            else
                data.put("invitCodeUpdated", false);
            data.put("vipLink", configService.get("vip_link"));// 超级会员升级链接
            data.put("vipLink", userVipConfigService.getValueByKey("vip_link"));// 超级会员升级链接
            if (!StringUtil.isNullOrEmpty(invitCode)) {
                String bossName = "";
fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java
New file
@@ -0,0 +1,177 @@
package com.yeshi.fanli.entity.system;
public enum ConfigKeyEnum {
    shareMessage("share_message", "短信分享编辑内容"),
    helpName("help_name", "帮助客服名称"),
    helpNumber("help_number", "帮助客服号码"),
    passwordErrorMAX("password_max_error", "用户每天最多输错密码次数"),
    extractWay("extract_way", "是否手动提现"),
    extractDayCount("extract_count_day", "用户每天最大提现次数"),
    extractMoneyMin("extract_min_money", "单笔提现最小金额"),
    extractMoneyMAX("extract_max_money", "单笔提现最大金额"),
    extractMoneyDay("extract_money_day", "用户每天最大提现金额"),
    extractCodeEmailFrom("extract_code_email_from", "发送提现验证码的邮箱"),
    detailPrompt("detail_prompt", "商品详情提示语"),
    newUserHongBao("new_user_hongbao", "新手红包是否开启"),
    newUserIsOrder("new_user_isorder", "新手红包是否下单生效"),
    recommendDetails("recommend_details", "动态推荐详情页面"),
    onlyInfo("only_info", "返回前端的"),
    shareSina("shareSina", "分享商品到新浪的前缀内容"),
    downAPP("downAPP", "下载APP链接"),
    xcxSetting("xcx_setting", "小程序更新设置"),
    h5Url("h5_url", "H5网页域名"),
    iosOnlingVersion("ios_onling_version", "IOS正在上线的版本"),
    rewardRankRange("reward_rank_range", "奖金榜金额上下幅度最大范围"),
    goodsShareTextCoupon("goods_share_text_coupon", "单个商品分享文案(有券)"),
    goodsShareTextNoCoupon("goods_share_text_nocoupon", "单个商品分享文案(无券)"),
    convertTaoBaoLinkInServer("convert_taobao_link_in_server", "是否在服务端转链"),
    homeWeexUrl("home_weex_url", "首页weex链接"),
    appFloatImg("app_float_img", "首页悬浮大图"),
    oldGoodsDetailHelpUrl("old_goods_detail_help_url", "老版商品详情页的帮助中心"),
    shareBonusPicture("shareBonusPicture", "1.4.0版本商品详情 分享奖金图片"),
    teamList("team_list", "我的队员链接"),
    lostOrderHelpWhat("lost_order_help_what", "订单找回-订单找回是什么"),
    lostOrderHelpReason("lost_order_help_reason", "订单找回-找回失败原因"),
    taobaoCartJS("taobao_cart_js", "淘宝购物车脚本"),
    tkRateRange("tkRate_range", "前端筛选比例范围"),
    alipayHelp("alipay_help", "支付宝帮助"),
    alipayBindFailReason("alipay_bind_fail_reason", "支付宝绑定失败可能原因"),
    pushGoodsDetails("push_goods_details", "推送页面"),
    teamHelpUrl("team_help_url", "我的队员 问号 跳转链接"),
    goodsShareNotify("goods_share_notify", "单个商品分享提醒"),
    goodsShareNotifyImgs("goods_share_notify_imgs", "单个商品分享的券提示图片"),
    goodsShareMultipleNotify("goods_share_multiple_notify", "多个商品分享提醒"),
    taobaoProxyIP("taobao_proxy_ip", "淘宝商品详情代理IP"),
    inviteTopBanner("invite_top_banner", "邀请页顶部大图"),
    inviteDesc("invite_desc", "邀请有奖特别说明"),
    orderListHelp("order_list_help", "订单列表帮助链接"),
    userRankTip("user_rank_tip", "用户等级页面特别提醒"),
    inviteActivationTip("invite_activation_tip", "邀请激活页面-特别提醒"),
    inviteActivationSuccessTip("invite_activation_success_tip", "邀请激活成功页面-特别提醒"),
    inviteActivationUrl("invite_activation_url", "邀请码激活页面"),
    inviteActivationSuccessUrl("invite_activation_success_url", "邀请码激活成功页面"),
    userRankContrast("user_rank_contrast", "用户等级对照图片url"),
    openSpeicalAndRelationApply("open_speical_and_relation_apply", "开启会员运营ID与渠道ID申请"),
    homeFloatNotifyImg("home_float_notify_img", "首页悬浮提示大图"),
    shareGoodsActivityOpen("share_goods_activity_open", "分享商品订单活动"),
    homeFloatImgNew("home_float_img_new", "首页悬浮广告位"),
    rewardCouponHelp("reward_coupon_help", "订单奖励券弹出框位置问号"),
    freeCouponHelp("free_coupon_help", "商品详情弹框免单券问号链接"),
    freeCouponTip("free_coupon_tip", "商品详情弹框免单券提示"),
    rewardCouponRemark("reward_coupon_remark", "奖励券备注"),
    freeCouponBackRemark("free_coupon_back_remark", "免单券退回页面备注"),
    freeCouponRemark("free_coupon_remark", "免单券进度使用中、成功备注"),
    lotteryRuleNewbies("lottery_rule_newbies", "新人抽奖界面规则内容"),
    freeGoodsList("free_goods_list", "免单商品列表"),
    freeCouponUsingHelp("free_coupon_using-help", "免单券使用中说明"),
    taobaoCartLink("taobao_cart_link", "购物车链接"),
    freeGoodsRule("free_goods_rule", "免单商品活动规则"),
    homeInviteBanner("home_invite_banner", "首页邀请有奖大图"),
    taobaoCouponHelp("taobao_coupon_help", "券帮助"),
    shareGoodsTemplateRules("share_goods_template_rules", "分享模板规则"), // 存在2个相同 内容不同、版本但一样
    indexHtmlLinkIos("index_html_link_ios", "首页-限时秒杀(IOS)网页链接"),
    indexHtmlLinkAndroid("index_html_link_android", "首页-限时秒杀(安卓)网页链接"),
    serviceProtocolLink("service_protocol_link", "服务协议"),
    privacyProtocolLink("privacy_protocol_link", "隐私协议"),
    lotteryRuleDailyRebate("lottery_rule_daily_rebate", "奖励券天天抽-抽奖规则"),
    taobaoOrderParseJS("taobao_order_parse_js", "淘宝订单解析脚本"),
    orderAppealCountDay("order_appeal_count_day", "每天最大申诉订单数量"),
    spikeGoodsLink("spike_goods_link", "限时秒杀跳转的网页链接"),
    inviteHelpLink("invite_help_link", "邀请好友帮助链接"),
    noRebateHelpLink("no_rebate_help_link", "商品详情无返利问号"),
    msgConfigZhushou("msg-config-zhushou", "消息-返利券小助手"),
    msgConfigGuanxuan("msg-config-guanxuan", "消息-官宣任务"),
    showTaobaoOrder("show_taobao_order", "是否显示淘宝订单"),
    showTaobaoCartConvert("show_taobao_cart_convert", "购物车是否转链"),
    autoFindTaobaoOrder("auto_find_taobao_order", "是否开启淘宝自动找单"),
    canSendEmergency_msg("can_send_emergency_msg", "是否发送服务器告警短信"),
    kefuMeiqia("kefu_meiqia", "美洽客服是否开启(0-关闭 1-开启)"),
    taobaoCartJumpDetail("taobao_cart_jump_detail", "我的购物车跳转方式"), // 存在2个相同 存在版本区分
    zigoulijianRule("zigoulijian_rule", "自购立减活动规则"),
    zigoulijianNofanliHelp("zigoulijian_nofanli_help", "自购立减无返利帮助"),
    hotFunctionUrl("hot_function_url", "热门功能链接"), // 存在2个相同 存在版本区分
    inviteCodeInputHelp("invite_code_input_help", "邀请码填写帮助"),
    shareSingleGoodsRule("share_single_goods_rule", "单品分享规则"),
    msgConfigNotify("msg-config-notify", "消息-大图通知"),
    shareOpenJD("share_jd_open", "京东商品是否开启分享"),
    jdApiSearchKey("jd_api_search_key", "京东API是否搜索"),
    jingdongH5Link("jingdong_h5_link", "京东跳转地址"),
    goodsShareTextCouponJD("goods_share_text_coupon_jd", "京东单个商品分享模板-有券"),
    goodsShareTextNoCouponJD("goods_share_text_nocoupon_jd", "京东单个商品分享模板-无券"),
    goodsShareNotifyJD("goods_share_notify_jd", "京东分享提醒"),
    shareGoodsTemplateRulesJD("share_goods_template_rules_jd", "京东模板规则"),
    goodsShareTextCouponPDD("goods_share_text_coupon_pdd", "拼多多单个商品分享模板-有券"),
    goodsShareTextNocouponPDD("goods_share_text_nocoupon_pdd", "拼多多单个商品分享模板-无券"),
    goodsShareNotifyPDD("goods_share_notify_pdd", "拼多多分享提醒"),
    shareGoodsTemplateRulesPDD("share_goods_template_rules_pdd", "拼多多模板规则"),
    shareRuleLinkJD("share_rule_link_jd", "京东分享规则(帮助中心)"),
    shareRuleLinkPDD("share_rule_link_pdd", "拼多多分享规则(帮助中心)"),
    tljOwnBuyNogoods("tlj_own_buy_nogoods", "自购立减无商品页面"),
    inviteCodeHlepLink("invite_code_hlep_link", "邀请码帮助中心-上级"),
    publishListHelpLink("publish_list_help_link", "邀请码发布帮助链接"),
    appDownLink("app_down_link", "APP下载地址"),
    giveFreeCouponTips("give_free_coupon_tips", "免单券赠送口令提示语"),
    giveRebatePercentCouponTips("give_rebate_percent_coupon_tips", "奖励券赠送口令提示"),
    exchangeRebatePercent("exchange_rebate_percent", "兑换奖励券比例"),
    freeCouponActivateNum("free_coupon_activate_num", "免单券激活订单数量"),
    firstOrderRewardBoss("first_order_reward_boss", "一级队员首单,奖励上级金币"),
    firstOrderRewardBossSuper("first_order_reward_boss_super", "二级队员首次下单,系统奖励金币 "),
    firstShareOrderReward("first_share_order_reward", "首笔分享订单,系统奖励金币"),
    firstShareOrderRewardBoss("first_share_order_reward_boss", "一级队员首笔分享订单,系统奖励金币 "),
    searchDiscoveryKeys("search_discovery_keys", "搜索发现关键词"),
    searchDiscoveryH5Link("search_discovery_h5_link", "搜索发现h5连接"),
    autoExtractHelpUrl("auto_extract_help_url", "自动提现帮助链接"),
    elemeHongbaoLink("eleme_hongbao_link", "饿了么红包链接"),
    elemeGoodsLink("eleme_goods_link", "饿了么商品链接"),
    specialGuideRewardCouponLink("special_guide_reward_coupon_link", "返利奖励券引导页"),
    tipGuideNewUser("tip_guide_new_user", "首页新人版/未登录版"),
    tipGuideSaveMoney("tip_guide_save_money", "首页省钱版"),
    tipGuideShareInvite("tip_guide_share_invite", "首页赚钱版"),
    adminMinSameGoodsOrderCount("admin_min_same_goods_order_count", "提现审核列表高危标识同商品订单数量最小值"),
    adminMinSameShopOrderCount("admin_min_same_shop_order_count", "提现审核列表高危标识同店铺订单数量最小值"),
    superHongBaoShareDesc("super-hongbao-share-desc", "双12红包分享语"),
    superYuShouShareDesc("super-yushou-share-desc", "双11预售分享语"),
    orderFindNotifyUrl("order_find_notify_url", "订单列表-订单找回帮助链接"),
    shareSingleGoodsCommentText("share_single_goods_comment_text", "单品分享评论区文案"),
    userProtocolHomeData("user_protocol_home_data", "用户协议首页内容"),
    inviteSeparateLimitDays("invite_separate_limit_days", "会员脱离期限"),
    customerServiceLink("customer_service_link", "人工客服链接"),
    taobaoShareQrcodeText("taobao_share_qrcode_text", "淘宝商品二维码识别文字"),
    brandBackgroundPicture("brand_background_picture", "品牌背景图片"),
    jdWXMPClass("jd_wxmp_class", "京东小程序分类"),
    goodsDetailFanliRateHelpUrl("goods_detail_fanli_rate_help_url", "商品详情返利比例说明"),
    articleHotWords("article_hot_words", "动态-学院文章热搜词"),
    vipLink("vip_link", "超级会员升级链接"), // 转移至VIPConfig   已废弃
    helpLinkVipInfo("help_link_vip_info", "超级会员详情页帮助链接"), //  已废弃
    ;
    private final String key;
    private final String desc;
    private ConfigKeyEnum(String key, String desc) {
        this.key = key;
        this.desc = desc;
    }
    public String getDesc() {
        return desc;
    }
    public String getKey() {
        return key;
    }
}