Merge remote-tracking branch 'origin/master'

k94314517

2025-07-15 d5fc82b308f1e4eea70f35d9684d0f26b8511013

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

@@ -18,13 +18,7 @@
    public static final String HWY_OBS_ACCESSKEY ="HWY_OBS_ACCESSKEY" ;
    public static final String HWY_OBS_ENDPOINT ="HWY_OBS_ENDPOINT" ;
    public static final String HWY_OBS_BUCKET ="HWY_OBS_BUCKET" ;
    public static final String FTP ="FTP" ;
    public static final String FTP_HOST ="FTP_HOST" ;
    public static final String FTP_PORT ="FTP_PORT" ;
    public static final String FTP_USERNAME ="FTP_USERNAME" ;
    public static final String FTP_PWD ="FTP_PWD" ;
    public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
    public static final String FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_RESOURCE_PATH" ;
    public static final String RESOURCE_PATH ="RESOURCE_PATH" ;
    public static final String QYWX_CORPID = "QYWX_CORPID";
    public static final String QYWX_SECRET = "QYWX_SECRET";
    public static final String QYWX_TOKEN = "QYWX_TOKEN";
@@ -52,6 +46,12 @@
    public static final String ABOUT_US ="ABOUT_US" ;


    public static final String RELEASE_CANCEL_TIMES ="RELEASE_CANCEL_TIMES" ;
    public static final String RECEIVE_CANCEL_TIMES ="RECEIVE_CANCEL_TIMES" ;
    public static final String RELEASE_CANCEL_TIME ="RELEASE_CANCEL_TIME" ;
    public static final String RECEIVE_CANCEL_TIME ="RECEIVE_CANCEL_TIME" ;
    public static final String AUTO_DISPATCH ="AUTO_DISPATCH" ;
    public static final String AUTO_DISPATCH_DISTANCE ="AUTO_DISPATCH_DISTANCE" ;

    public static final String QYWX = "QYWX";
    public static final  Integer ONE = 1;
@@ -61,6 +61,10 @@
    public static final Integer FOUR = 4;
    public static final Integer SIX = 6;
    public static final Integer FIVE = 5;
    public static final String INENTITY_FILES = "INENTITY_FILES";
    public static final String MEMBER_FILES = "MEMBER_FILES";
    public static final String CATEGORY_FILES = "CATEGORY_FILES";
    public static final String ORDERS_FILES = "ORDERS_FILES";
    public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
    public static  boolean DEALING_COMPANY_SYNC = false ;
    public static  boolean DEALING_MEMBER_SYNC = false ;
@@ -79,7 +83,7 @@
    interface CacheKey {
    }
    public interface RedisKeys {
        public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
        public static final String ORDER_CODE = "ORDER_CODE";
    }
    /**
     * 操作类型，用于做接口验证分组
@@ -388,4 +392,136 @@


    }




    public  enum OrdersLog {
        UPLOAD(0, "发单方-发布订单","{userName}发布{param}",0),
        RECEIVE(1, "接单方-已抢单","{userName}已抢单",1),
        UPD_ORDER(2, "发单方-修改订单","{userName}修改了用工时间",0),
        UPD_DISAGREE(3, "接单方-不同意修改,订单取消","{userName}不同意修改，订单取消",1),
        UPD_AGREE(4, "接单方-同意修改","{userName}同意修改",1),
        AUTO(5, "系统-自动派单","无人接单已自动派单给{userName}",1),
        CANCEL(6, "接单方-取消接单","{userName}已手动取消接单",1),
        BEGIN(7, "发单方-开始作业","{userName}已开始作业",0),
        DONE(8, "发单方-完成作业","{userName}已确认完成作业",0),
        PAY(9, "发单方-完成支付","{userName}已支付费用",0),
        COMMENT(10, "发单方-评价完成","{userName}完成评价",0),
        SYSTEM_CANCEL(11, "系统-订单取消","系统取消",2),
        RELEASE_CANCEL(12, "发单方-订单取消","{userName}已手动取消订单",0),

        ;
        // 成员变量
        private String name;
        private String info;
        private int key;
        private int userType;

        // 构造方法
        OrdersLog(int key, String name,String info,int userType) {
            this.name = name;
            this.info = info;
            this.key = key;
            this.userType = userType;
        }

        // 普通方法
        public static String getName(int index) {
            for (OrdersLog c : OrdersLog.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            return null;
        }
        public static String getInfo(int index) {
            for (OrdersLog c : OrdersLog.values()) {
                if (c.getKey() == index) {
                    return c.info;
                }
            }
            return null;
        }

        // get set 方法
        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

        public int getUserType() {
            return userType;
        }

        public void setUserType(int key) {
            this.userType = userType;
        }

        public String getInfo() {
            return info;
        }

        public void setInfo(String info) {
            this.info = info;
        }
    }


    public  enum workType {
        czg(0, "采摘工"),
        fjg(1, "分拣工"),
        bzg(2, "包装工"),

        ;
        // 成员变量
        private int key;
        private String name;

        // 构造方法
        workType(int key, String name) {
            this.name = name;
            this.key = key;
        }

        // 普通方法
        public static String getName(int index) {
            for (OrdersLog c : OrdersLog.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            return null;
        }
        // get set 方法
        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

    }


}