Merge remote-tracking branch 'origin/master'

doum

6 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

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

@@ -856,29 +856,95 @@



    //对象类型 0商城订单 1积分流水 2优惠券发放 3过期提醒 4社区消息
    public enum NoticeType{
        NOTICE_ORDER_SEND(10,"商城订单",0,0,"订单已发货","您购买的商品订单：{param} 已发货"),
        NOTICE_ORDER_WRITE_OFF(11,"商城订单",0,0,"订单已核销","您购买的商品订单：{param} 已核销"),
        NOTICE_ORDER_REFUND(12,"商城订单",0,0,"订单已退款","您购买的商品订单：{param} 已退款"),

//        0订单通知 1系统消息 2互动消息 3优惠券提醒 4官方客服 5活动推荐 6我的关注
        INTEGRAL_INVITE(20,"积分流水",1,0,"积分变动通知","邀请好友成功，获得{param}积分"),

        NOTICE_ORDER(0,"0订单通知","0订单通知"),
        NOTICE_SYSTEM(1,"1系统消息","1系统消息"),
        NOTICE_INTERACTION(2,"互动消息","互动消息"),
        NOTICE_MEMBER_COUPON(3,"优惠券提醒","优惠券提醒"),
        NOTICE_ACTIVITY(5,"活动推荐","活动推荐"),
        NOTICE_MEMBER_FOLLOW(6,"我的关注","我的关注")
        COUPON(30,"优惠券发放",2,0,"优惠券发放","已获得优惠券，{param}"),


        EXPIRE_INTEGRAL(40,"积分过期提醒",3,0,"积分即将过期","您有{param}积分即将过期"),
        EXPIRE_COUPON(41,"优惠券发放",3,0,"优惠券发放","您有{param}张优惠券将在{param2}过期"),

        COMMENT(50,"社区消息",4,1,"收到评论","{param}回复了您的评论"),

        ;

        private Integer key;
        private String info;  //消息名称
        private Integer objType; //对象类型 0商城订单 1积分流水 2优惠券发放 3过期提醒 4社区消息
        private Integer noticeType; //消息类型  0=系统消息；1=社区消息
        private String title;//标题
        private String content; //提示文案

        private String type;

        private String content;

        NoticeType(Integer key, String type, String content) {
        NoticeType(Integer key,String info, Integer objType,  Integer noticeType,String title,String content) {
            this.key = key;
            this.type = type;
            this.objType = objType;
            this.noticeType = noticeType;
            this.info = info;
            this.title = title;
            this.content = content;
        }


        public Integer getKey() {
            return key;
        }

        public void setKey(Integer key) {
            this.key = key;
        }


        public Integer getObjType() {
            return objType;
        }

        public void setObjType(Integer objType) {
            this.objType = objType;
        }


        public Integer getNoticeType() {
            return noticeType;
        }

        public void setNoticeType(Integer noticeType) {
            this.noticeType = noticeType;
        }


        public String getInfo() {
            return info;
        }

        public void setInfo(String info) {
            this.info = info;
        }


        public String getContent() {
            return content;
        }

        public void setContent(String content) {
            this.content = content;
        }


        public String getTitle() {
            return title;
        }

        public void setTitle(String title) {
            this.title = title;
        }


    }

    /**
@@ -1367,4 +1433,11 @@
                        + ")";
    }








}