Merge remote-tracking branch 'origin/master'

doum

7 小时以前 1af395ecb948a9d0af14aa72d7fc8025e849e6bc

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

@@ -991,6 +991,61 @@

    }

    public enum WxNotice {

        GOODSORDER_SEND(0,"您购买的商品【{param}】已发货","/","02BlSaqsSje7IjsWy0K7HdH7ArpOsEHD14OQU2Mk2Cs"),
        GOODSORDER_WRITEOFF(1,"您购买的商品【{param}】已核销","/","A_-0NgHwX5a6Dlst64rqcDtcz_fGILwl3HTpN1rf7GE"),
        GOODSORDER_REFUND(2,"您购买的商品【{param}】已退款，退款金额【￥{param2}】","/","yGwMHrXM3Qd55hdSeaKY9dLb-kfgE2Vs-8iK9kQaveI");

        WxNotice(int i, String s, String s1,String s2) {
            this.type = i;
            this.noticeInfo = s;
            this.jumpUrl = s1;
            this.tempId = s2;
        }


        private int type;
        private String noticeInfo; //通知信息
        private String jumpUrl;//跳转路径
        private String tempId;//跳转路径


        public int getType() {
            return type;
        }

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

        public String getNoticeInfo() {
            return noticeInfo;
        }

        public void setNoticeInfo(String noticeInfo) {
            this.noticeInfo = noticeInfo;
        }

        public String getJumpUrl() {
            return jumpUrl;
        }

        public void setJumpUrl(String jumpUrl) {
            this.jumpUrl = jumpUrl;
        }
        public String getTempId() {
            return tempId;
        }
        public void setTempId(String tempId) {
            this.tempId = tempId;
        }


    }




    /**
     * 标签类型
@@ -1201,7 +1256,7 @@
    public  enum UserActionType {
        CHANGE_SHOP(0, "经销商更换","由【${param1}】于【${param2}】，进行【经销商更换】" ),
        CHANGE_SALETYPE(1, "经销商更换销售模式","由【${param1}】于【${param2}】，进行【销售模式变更】" ),
        CHANGE_ORDER_KD(2, "订单快递更换","由【${param1}】于【${param2}】，进行【订单快递更换】;${param3}" ),
        CHANGE_ORDER_KD(2, "订单快递更换","${param1}" ),
        ;

        // 成员变量