Merge remote-tracking branch 'origin/master'

doum

12 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -42,6 +42,9 @@
    public static final String ORDER_SET ="ORDER_SET" ;
    public static final String INTEGRAL_SET ="INTEGRAL_SET" ;

    public static final String MEMBER_PREFIX  = "member_";
    public static final String SHOP_PREFIX  = "shop_";

    /**
     * mq tag
     */
@@ -128,11 +131,14 @@

    public static final String COFFEE_ARTICLE_BACKGROUND = "COFFEE_ARTICLE_BACKGROUND";

    public static final String TRANSFER_FILE = "TRANSFER_FILE";


    public interface RedisKeys {
        public static final String GOODSORDER_KEY = "ordercode_";
        public static final String ACTIVITY_SIGN_KEY = "actcode_";
        public static final String AFTERSALE_KEY = "salecode_";
        public static final String WITHDRAW_KEY = "withdraw_";
    }
    /**
     * 企业数据来源 0平台注册 1后台导入
@@ -326,6 +332,7 @@
        SHOP_PICTURE(7, "商家图片多图", "商家图片多图"),
        AFTERSALE_APPLY(8, "申请售后补充说明附件", "申请售后补充说明附件"),
        AFTERSALE_KD(9, "申请售后邮寄说明附件", "申请售后邮寄说明附件"),
        TRANSFER_FILE(10, "打款凭证", "打款凭证"),
        ;
        // 成员变量
        private String name;
@@ -867,7 +874,11 @@
        ORDER_DONATE(15,"订单赠送积分","订单赠送积分",0),
        ORDER_DONE_AMOUNT(16,"订单结算金额","订单结算金额",0),

        SHOP_ORDER_SETTLEMENT(16,"下单结算金额","下单结算金额",0), //经销商下单结算金额
        WITHDRAW_APPLY(17,"余额提现","余额提现",0), //经销商下单结算金额




        SHOP_ORDER_CANCEL_SETTLEMENT(17,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
        SHOP_YEAR_SETTLEMENT(18,"年度结算","年度结算",0) //年度结算
        ;