增加平台规则返回

admin

2020-04-24 36ed2603adfc5fef6fad1d5941020e2533db9405

增加平台规则返回

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java

@@ -400,6 +400,11 @@
                    }

                }

                data.put("vip", inner);

                //平台规则

                String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey());

                data.put("platformRule", platformRuleLink);

				
				
            }


            if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion()) && uid != null) {


 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -20,7 +20,8 @@
    shareRuleLinkJD("share_rule_link_jd", "京东分享规则（帮助中心）"),
    shareRuleLinkPDD("share_rule_link_pdd", "拼多多分享规则（帮助中心）"),
    shareSingleGoodsRule("share_single_goods_rule", "单品分享规则"),
    shareGoodsTemplateRules("share_goods_template_rules", "分享模板规则"), // 存在2个相同 内容不同、版本但一样
    shareGoodsTemplateRules("share_goods_template_rules", "分享模板规则"), // 存在2个相同
                                                                        // 内容不同、版本但一样
    shareGoodsTemplateRulesJD("share_goods_template_rules_jd", "京东模板规则"),
    shareGoodsTemplateRulesPDD("share_goods_template_rules_pdd", "拼多多模板规则"),
    goodsShareNotifyImgs("goods_share_notify_imgs", "单个商品分享的券提示图片"),
@@ -82,7 +83,8 @@
    taobaoProxyIP("taobao_proxy_ip", "淘宝商品详情代理IP"),
    taobaoCartJS("taobao_cart_js", "淘宝购物车脚本"),
    taobaoCartLink("taobao_cart_link", "购物车链接"),
    taobaoCartJumpDetail("taobao_cart_jump_detail", "我的购物车跳转方式"), // 存在2个相同 存在版本区分
    taobaoCartJumpDetail("taobao_cart_jump_detail", "我的购物车跳转方式"), // 存在2个相同
                                                                    // 存在版本区分
    taobaoCouponHelp("taobao_coupon_help", "券帮助"),
    convertTaoBaoLinkInServer("convert_taobao_link_in_server", "是否在服务端转链"),
    showTaobaoCartConvert("show_taobao_cart_convert", "购物车是否转链"),
@@ -165,32 +167,33 @@
    inviteRules("invite_rules", "动态-学院文章热搜词"),
    vipLink("vip_link", "超级会员升级链接"), // 转移至VIPConfig 已废弃
    helpLinkVipInfo("help_link_vip_info", "超级会员详情页帮助链接"), // 已废弃
    //文案转链
    convertDocWebLink("convert_doc_web_link","文案转链网页"),
    convertDocHelpLink("convert_doc_help_link","文案转链帮助网页"),
    convertDocTip("convert_doc_tip","文案转链温馨提示"),
    newerGonglue("newer_gonglue_url","新手攻略链接"),
    tearcherLink("tearcher_link","导师链接"),
    // 文案转链
    convertDocWebLink("convert_doc_web_link", "文案转链网页"),
    convertDocHelpLink("convert_doc_help_link", "文案转链帮助网页"),
    convertDocTip("convert_doc_tip", "文案转链温馨提示"),
    newerGonglue("newer_gonglue_url", "新手攻略链接"),
    tearcherLink("tearcher_link", "导师链接"),
    quickShareGoodsText("quick_share_goods_text", "快捷分享商品文本"),
    quickShareTBCommentText("quick_share_tb_comment_text", "快捷分享商品文本"),
    quickShareJDCommentText("quick_share_jd_comment_text", "快捷分享商品文本"),
    quickSharePDDCommentText("quick_share_pdd_comment_text", "快捷分享商品文本"),
	

    shareCommentTextTB("share_comment_text_tb", "淘宝单图多图分享商品文本"),
    shareCommentTextJD("share_comment_text_jd", "京东单图多图分享商品文本"),
    shareCommentTextPDD("share_comment_text_pdd", "拼多多单图多图分享商品文本"),
	

    evaluateEmojis("evaluate_emojis", "发圈评论Emojis"),
    evaluateText("evaluate_text", "发圈评论文本"),
	

    vipUpgradeLink("vip_upgrade_link", "我的界面-会员升级链接"),
	

    orderRebateDescLink("order_rebate_desc_link", "订单返利计算说明链接"),
    bonusCountLinkFanli("bonus_count_link_fanli", "自购返利统计页面问号"),
    bonusCountLinkShare("bonus_count_link_share", "分享奖金统计页面问号"),
    bonusCountLinkTeam("bonus_count_link_team", "团队奖励统计页面问号"),
    ;

    // 平台规则
    platformRule("platform_rule_link", "平台规则");

    private final String key;
    private final String desc;

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java

@@ -84,6 +84,9 @@
                if (dto == null || dto.getStaticticDate().getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME)

                    return Action.CommitMessage;



                if (dto.isMiandan())// 免单的商品不参与分红

                    return Action.CommitMessage;



                if (dto.getHandleType() == OrderMQMsg.HANDLE_TYPE_ADD) {

                    List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(dto.getType(),

                            dto.getOrderId());