Merge remote-tracking branch 'origin/master'

doum

8 小时以前 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

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

@@ -856,44 +856,43 @@
     * 积分类型
     */
    public  enum IntegralObjType {
        REGISTER(0, "平台注册", "平台注册",0),
        SIGNIN(1, "签到", "签到",0),
        SHARE(2, "分享邀请", "分享邀请",0),
        INVITENEWUSER(3, "邀请新用户", "邀请新用户",0),
        EXCHANGEGOODS(4, "兑换商品", "兑换商品",1),
        EXCHANGECOUPON(5, "兑换优惠券", "兑换优惠券",1),
        SHARE_INFO(6,"分享资讯","分享资讯",0),
        POST_COMMENTS(7,"发布评论","发布评论",0),
        COFFEE_MAP_CONSUME(8,"咖啡地图消费","咖啡地图消费",0),
        SHOP_ORDER(9,"积分抵扣商品","积分抵扣商品",1),
        AFTERSALE_BACK(10,"售后退款","售后退款",1),
        EXCHANGE_CARD(11,"卡充值","卡充值",0),
        SYSTEM_RECHARGE(12,"平台充值","平台充值",0),
        SYSTEM_DEDUCT(13,"平台扣款","平台扣款",0),
        SHOP_ORDER_CANCEL(14,"积分抵扣商品退还","积分抵扣商品退还",0),
        ORDER_DONATE(15,"订单赠送积分","订单赠送积分",0),
        ORDER_DONE_AMOUNT(16,"订单结算金额","订单结算金额",0),
        REGISTER(0, "平台注册", "平台注册",0,0),
        SIGNIN(1, "签到", "签到",0,0),
        SHARE(2, "分享邀请", "分享邀请",0,0),
        INVITENEWUSER(3, "邀请新用户", "邀请新用户",0,0),
        EXCHANGEGOODS(4, "兑换商品", "兑换商品",1,0),
        EXCHANGECOUPON(5, "兑换优惠券", "兑换优惠券",1,0),
        SHARE_INFO(6,"分享资讯","分享资讯",0,0),
        POST_COMMENTS(7,"发布评论","发布评论",0,0),
        COFFEE_MAP_CONSUME(8,"咖啡地图消费","咖啡地图消费",0,0),
        SHOP_ORDER(9,"积分抵扣商品","积分抵扣商品",1,0),
        AFTERSALE_BACK(10,"售后退款","售后退款",1,0),
        EXCHANGE_CARD(11,"卡充值","卡充值",0,0),
        SYSTEM_RECHARGE(12,"平台充值","平台充值",0,0),
        SYSTEM_DEDUCT(13,"平台扣款","平台扣款",0,0),
        SHOP_ORDER_CANCEL(14,"积分抵扣商品退还","积分抵扣商品退还",0,0),

        WITHDRAW_APPLY(17,"余额提现","余额提现",0), //经销商下单结算金额
        ORDER_DONATE(15,"订单赠送积分","订单赠送积分",0,0),
        ORDER_DONE_AMOUNT(16,"订单结算金额","订单结算金额",0,1),

        WITHDRAW_APPLY(17,"余额提现","余额提现",0,1),



        SHOP_ORDER_CANCEL_SETTLEMENT(17,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
        SHOP_YEAR_SETTLEMENT(18,"年度结算","年度结算",0) //年度结算
        SHOP_YEAR_SETTLEMENT(18,"年度结算","年度结算",0,1)
        ;
        // 成员变量
        private String name;
        private int key;
        private String noteinfo;// 描述
        private Integer addTitle; // 0 = 新增；1 = 不新增
        private Integer type; // 0 = 积分；1=现金

        // 构造方法
        IntegralObjType(int key, String name, String noteinfo ,Integer addTitle) {
        IntegralObjType(int key, String name, String noteinfo ,Integer addTitle,Integer type) {
            this.name = name;
            this.key = key;
            this.noteinfo = noteinfo;
            this.addTitle = addTitle;
            this.type = type;
        }

        // 普通方法
@@ -916,6 +915,14 @@
            return null;
        }

        public void setType(Integer type) {
            this.type = type;
        }

        public Integer getType() {
            return type;
        }

        // get set 方法
        public String getName() {
            return name;