Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-08-29 b030378e316508eb5071aebe9d8494ad094f490f

 src/main/java/com/mzl/flower/constant/Constants.java

@@ -296,7 +296,9 @@

    public enum SETTLEMENT_STATUS {
        PENDING("待结算"),
        COMPLETED("已结算"),
        PROCESSING("结算中"),
        COMPLETED("结算成功"),
        FAILED("结算失败"),
        ;

        SETTLEMENT_STATUS(String desc) {
@@ -428,4 +430,83 @@
        }
    }

    public enum POINT_GOODS_STATUS {
        A("上架"),
        I("下架");

        POINT_GOODS_STATUS(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }

    public enum POINT_GOOD_STATUS {
        up("上架"),
        off("下架");

        POINT_GOOD_STATUS(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }

    public enum POINT_CHANGE_TYPE {
        add("增加"),
        reduce("减少");

        POINT_CHANGE_TYPE(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }


    public enum POINT_TYPE {
        consume("消费获取"),
        activity("活动获取"),
        giveaway("积分赠送"),
        deduction("积分扣减"),
        exchange("积分兑换");

        POINT_TYPE(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }

    public enum POINT_GOODS_RECORD_STATUS {
        A("未使用"),
        U("已使用"),
        E("已过期");

        POINT_GOODS_RECORD_STATUS(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }
}