Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-11-07 5e1cfd9032785dbe6438c830acad294d346f2734

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

@@ -35,7 +35,7 @@
    public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
    public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
    //车辆类型数据
    public static final String  BIKE_TYPE ="1,2,3,4,5,6,7,8" ;
    public static final String  BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
    public static String REDIS_DEBUG_STR="test_";
    public static final String AD = "AD";
    public static String REPAIR = "REPAIR";
@@ -174,6 +174,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是
@@ -211,6 +213,14 @@
            }
            return num;
        }
        public static Integer formatIntegerFromStr(String num) {
            try {
                return  Integer.parseInt(num);
            }catch (Exception e){

            }
            return null;
        }

        public interface UserActionsType {
            String cancelPrePay = "CANCEL_PRE_PAY";