111

k94314517

2023-11-08 2bb847e3b8bdc2692d88ad9df0d4ad54a3ccd890

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -27,6 +27,7 @@
    public static final String DINGDING ="DINGDING" ;
    public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
    public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
    public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
    public static final String IMG_DIR = "IMG_DIR";
    public static final String FILE_DIR ="FILE_DIR" ;
    public static final String PRIVATE_KEY = "PRIVATE_KEY";
@@ -88,11 +89,11 @@
      //交易类型 0租车押金 1结算实际消费 2结算退款 3平台退款"
        DEPOSIT(0,"租车押金", "租车押金"),

        CONSUMPTION(1,"结算实际消费", "结算实际消费"),
        CONSUMPTION(1,"订单消费结算", "订单消费结算"),

        REFUND(2,"结算退款", "结算退款"),
        REFUND(2,"结算退押金", "结算退押金"),

        PLATFORMREFUND(3,"平台退款", "平台退款")
        PLATFORMREFUND(3,"平台退押金", "平台退押金")

        ;
        String name;
@@ -174,6 +175,8 @@
        public static final String RENT_DEPOSIT = "RENT_DEPOSIT";
        //温馨提示
        public static final String TIPS = "TIPS";
        //温馨提示
        public static final String RENT_NOTICE = "RENT_NOTICE";
        //小程序停止服务提示
        public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS";
        //小程序是否停止服务 0否 1是
@@ -210,6 +213,14 @@
                return 0;
            }
            return num;
        }
        public static Integer formatIntegerFromStr(String num) {
            try {
                return  Integer.parseInt(num);
            }catch (Exception e){

            }
            return null;
        }

        public interface UserActionsType {
@@ -325,13 +336,13 @@

    public enum REFUND_TYPE{
        // '退款类型 0用户结算退款 1平台自动结算退款 2强制结算退款 3结算后退款'
        NORMAL(  0,"用户结算退款",""),
        NORMAL(  0,"用户结算退款","结算退押金"),

        PLAT_AUTO( 1,"平台自动结算退款",""),
        PLAT_AUTO( 1,"平台自动结算退款","平台退押金"),

        PLAT_FORCE( 2,"强制结算退款",""),
        PLAT_FORCE( 2,"强制结算退款","平台退押金"),

        BACK( 3,"结算后退款",""),
        BACK( 3,"结算后退款","平台退款"),

        ;
        String name;