Merge remote-tracking branch 'origin/master'

doum

11 小时以前 0982a97b0c65e11034b9d6b00cc0e4aba39254be

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

@@ -623,8 +623,7 @@
        DONE(3, "交易完成", "交易完成"),
        CLOSE(4, "已关闭", "已关闭"),
        PART_DONE(5, "部分发货", "部分发货"),


        REFUND(6, "订单退款", "订单退款"),
        ;
        // 成员变量
        private String name;
@@ -881,7 +880,7 @@
     */
    public  enum IntegralObjType {
        REGISTER(0, "注册积分奖励", "注册成功，获得${param}积分",0,0),
        INVITENEWUSER(3, "邀请好友得积分", "推荐好友${param}成功，获得${param1}积分",0,0),
        INVITENEWUSER(3, "邀请好友得积分", "推荐好友${param1}成功，获得${param}积分",0,0),
        SYSTEM_RECHARGE(12,"积分发放","平台奖励，获得${param}积分",0,0),
        SYSTEM_DEDUCT(13,"积分扣除","平台扣减，消耗${param}积分",0,0),
        MEMBER_ORDER_CANCEL(14,"取消订单退回","交易退款退回，获得${param}积分",0,0),
@@ -890,17 +889,21 @@
        SHOP_YEAR_SETTLEMENT(18,"积分过期","积分过期，消耗${param}积分",0,0),


        ORDER_DONE_AMOUNT(16,"订单结算","${param}订单结算成功，获得￥${param1}元",0,1),//${param}订单编号，${param1}金额
        ORDER_DONE_AMOUNT(16,"订单结算","${param1}订单结算成功，获得￥${param}元",0,1),//${param}订单编号，${param1}金额
        WITHDRAW_APPLY(17,"余额提现","余额提现已提交，消耗￥${param}元",0,1),
        WITHDRAW_APPLY_BACK(19,"提现退回","余额提现失败，获得￥${param}元",0,1),
        ORDER_DONE_AMOUNT_BACK(20,"订单结算退回","${param}订单结算退回，消耗￥${param1}元",0,1),//${param}订单编号，${param1}金额
        ORDER_DONE_AMOUNT_BACK(20,"订单结算退回","${param1}订单结算退回，消耗￥${param}元",0,1),//${param}订单编号，${param1}金额


        SHOP_ORDER(21,"消费返积分","会员${param}交易成功，获得${param1}积分",0,0),//${param}昵称-手机号
        SHOP_ORDER(21,"消费返积分","会员${param1}交易成功，获得${param}积分",0,0),//${param}昵称-手机号
        SHOP_ORDER_CANCEL(22,"订单取消退回","订单取消退回，退回${param}积分",0,0),
        SHOP_SYSTEM_RECHARGE(23,"积分发放","平台奖励，获得${param}积分",0,0),
        SHOP_SYSTEM_DEDUCT(24,"积分扣除","平台扣减，消耗${param}积分",0,0),

        SHOP_ORDER_REFUND_CASH(25,"订单退款","订单退款，扣除结算金额${param}元",0,0),
        SHOP_ORDER_REFUND_INTEGRAL(26,"订单退款","订单退款，扣除订单返还${param}积分",0,0),
        MEMBER_ORDER_REFUND_RETURN(27,"订单退款","订单退款，扣除订单返还${param}积分",0,0),
        MEMBER_ORDER_REFUND(28,"订单退款","订单退款，返还订单消耗${param}积分",0,0),

        //----------------废弃-------start---------
        SIGNIN(1, "签到", "签到",0,0),
@@ -990,6 +993,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,6 +1259,7 @@
    public  enum UserActionType {
        CHANGE_SHOP(0, "经销商更换","由【${param1}】于【${param2}】，进行【经销商更换】" ),
        CHANGE_SALETYPE(1, "经销商更换销售模式","由【${param1}】于【${param2}】，进行【销售模式变更】" ),
        CHANGE_ORDER_KD(2, "订单快递更换","${param1}" ),
        ;

        // 成员变量