Merge remote-tracking branch 'origin/master'

doum

6 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

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

@@ -22,25 +22,25 @@
    public static final int FOUR = 4 ;
    public static final String LABELS_IMG ="LABELS_IMG" ;
    public static final String ORDERSET_REG_INTEGRAL_REWARD_STATUS = "ORDERSET_REG_INTEGRAL_REWARD_STATUS";
     public static final String ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
     public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
     public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
     public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
     public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
     public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
     public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
     public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
     public static final String ORDERSET_RETURN_SHOP_INTEGRAL_STATUS="ORDERSET_RETURN_SHOP_INTEGRAL_STATUS";
     public static final String ORDERSET_RETURN_MEMBER_INTEGRAL="ORDERSET_RETURN_MEMBER_INTEGRAL";
     public static final String ORDERSET_RETURN_SHOP_INTEGRAL="ORDERSET_RETURN_SHOP_INTEGRAL";
    public static final String ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
    public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
    public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
    public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
    public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
    public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
    public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
    public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
    public static final String ORDERSET_RETURN_SHOP_INTEGRAL_STATUS="ORDERSET_RETURN_SHOP_INTEGRAL_STATUS";
    public static final String ORDERSET_RETURN_MEMBER_INTEGRAL="ORDERSET_RETURN_MEMBER_INTEGRAL";
    public static final String ORDERSET_RETURN_SHOP_INTEGRAL="ORDERSET_RETURN_SHOP_INTEGRAL";

     public static final String INTERALSET_DEDUCTINTEGRALLIMIT="INTERALSET_DEDUCTINTEGRALLIMIT";
     public static final String INTERALSET_MININTEGRALPRICELIMIT="INTERALSET_MININTEGRALPRICELIMIT";
     public static final String INTERALSET_INTEGRALINVALIDTYPE="INTERALSET_INTEGRALINVALIDTYPE";
     public static final String INTERALSET_INTEGRALINVALIDCIRCLE="INTERALSET_INTEGRALINVALIDCIRCLE";
     public static final String INTERALSET_INTEGRALRULEINFO="INTERALSET_INTEGRALRULEINFO";
    public static final String INTERALSET_DEDUCTINTEGRALLIMIT="INTERALSET_DEDUCTINTEGRALLIMIT";
    public static final String INTERALSET_MININTEGRALPRICELIMIT="INTERALSET_MININTEGRALPRICELIMIT";
    public static final String INTERALSET_INTEGRALINVALIDTYPE="INTERALSET_INTEGRALINVALIDTYPE";
    public static final String INTERALSET_INTEGRALINVALIDCIRCLE="INTERALSET_INTEGRALINVALIDCIRCLE";
    public static final String INTERALSET_INTEGRALRULEINFO="INTERALSET_INTEGRALRULEINFO";

   public static final String ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
    public static final String ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
    public static final String ORDER_SET ="ORDER_SET" ;
    public static final String INTEGRAL_SET ="INTEGRAL_SET" ;

@@ -50,17 +50,23 @@
    public static final String ABOUT_US = "ABOUT_US";
    public static final String SERVER_INTRODUCE = "SERVER_INTRODUCE";
    public static final String SERVER_PHONE ="SERVER_PHONE" ;
    public static final String SHOP_INTEGRAL_BG ="SHOP_INTEGRAL_BG" ;
    public static final String USER_INVITE_BG ="USER_INVITE_BG" ;
    public static final String CENTER_INVITE_BG ="CENTER_INVITE_BG" ;
    public static final String USER_SHARE_BG ="USER_SHARE_BG" ;



    /**
     * mq tag
     */
    public interface MQ_TAG{
         String order = "order";
        String order = "order";
        String activity = "activity";
    }
    public interface MQ_KEY{
         String activity_looknum = "looknum";
         String activity_signup = "signup";
        String activity_looknum = "looknum";
        String activity_signup = "signup";
    }
    public static final String SUCCESS_STR = "SUCCESS" ;

@@ -121,23 +127,23 @@
    public static final String  POST_COMMENTS="POST_COMMENTS";//发布评论
    public static final String  COFFEE_MAP_CONSUME="COFFEE_MAP_CONSUME";//咖啡地图消费

        //（发现）
    //（发现）
    public static final String ACTIVITY_FILE = "ACTIVITY";
        //轮播）
    //轮播）
    public static final String BANNER_FILE = "BANNER";
        //(商品)
    //(商品)
    public static final String GOODS_FILE = "GOODS";
        //(用户）
    //(用户）
    public static final String MEMBER_FILE = "MEMBER";
      //商家
    //商家
    public static final String SHOP_FILE = "SHOP";
        //(系统配置等）
    //(系统配置等）
    public static final String  SYSTEM_FILE = "SYSTEM";
        //(评论）
    //(评论）
    public static final String COMMENT_FILE = "COMMENT";
        //其他）
    //其他）
    public static final String OTHER_FILE = "OTHER";
        //
    //
    public static final String AFTERSALE_FILE = "AFTERSALE";

    public static final String COFFEE_ARTICLE_BACKGROUND = "COFFEE_ARTICLE_BACKGROUND";
@@ -748,7 +754,7 @@
    }

    public enum ShareType{
//    0活动1探店2咨询3店铺 4商品5分享邀请海报
        //    0活动1探店2咨询3店铺 4商品5分享邀请海报
        SHARE_ACTIVITY_ACTIVITY(0,"活动","活动"),
        SHARE_ACTIVITY_VISITSHOP(1,"探店","咨询"),
        SHARE_ACTIVITY_NEW(2,"咨询","咨询"),
@@ -850,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;
        }


    }

    /**
@@ -894,11 +966,11 @@
        ORDER_DONE_AMOUNT(16,"订单结算","${param1}订单结算成功，获得￥${param}",0,1),//${param}订单编号，${param1}金额
        WITHDRAW_APPLY(17,"余额提现","余额提现已提交，消耗￥${param}",0,1),
        WITHDRAW_APPLY_BACK(19,"提现退回","余额提现失败，获得￥${param}",0,1),
        SHOP_ORDER_REFUND_CASH(25,"订单退款","${param1}订单退款，扣除结算金额￥${param}",0,0),
        SHOP_ORDER_REFUND_CASH(25,"订单结算退回","${param1}订单退款，扣除结算金额￥${param}",0,0),


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

    public static String getBankInfo(String bankName, String bankAccount){
        return bankName + "("+
                        bankAccount.
                                replaceAll("^.*(.{4})$", "$1")
                        + ")";
                bankAccount.
                        replaceAll("^.*(.{4})$", "$1")
                + ")";
    }








}