Merge remote-tracking branch 'origin/master'

jiangping

2025-07-19 0cfbaf9a439dc75824c52a6e58b6849064afbc80

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

@@ -44,6 +44,9 @@
    public static final String SERVER_INTRODUCE ="SERVER_INTRODUCE" ;
    public static final String FEE_STANDARDS ="FEE_STANDARDS" ;
    public static final String ABOUT_US ="ABOUT_US" ;
    public static final String SERVER_PHONE ="SERVER_PHONE" ;
    public static final String USER_AGREEMENT ="USER_AGREEMENT" ;
    public static final String PRIVACY_AGREEMENT ="PRIVACY_AGREEMENT" ;


    public static final String RELEASE_CANCEL_TIMES ="RELEASE_CANCEL_TIMES" ;
@@ -356,9 +359,9 @@
    @Getter
    public enum RevenueType {

        YGD_INCOME(  0, "用工单收入","用工单收入" ,0),
        HYD_INCOME(  1, "货运单收入","货运单收入" ,0),
        GCD_INCOME(2, "供餐单收入","供餐单收入" ,0),
        YGD_INCOME(  0, "用工单收入","用工单" ,0),
        HYD_INCOME(  1, "货运单收入","货运单" ,0),
        GCD_INCOME(2, "供餐单收入","供餐单" ,0),
        WITHDRAW_APPLY(3, "提现申请","提现申请" ,0),
        REFUND(  4, "提现申请退回","提现申请退回" ,0)
        ;
@@ -378,6 +381,22 @@
            for (RevenueType c : RevenueType.values()) {
                if (c.getKey() == index) {
                    return c;
                }
            }
            return null;
        }
        public static String getName(int index) {
            for (RevenueType c : RevenueType.values()) {
                if (c.getKey() == index) {
                    return c.getName();
                }
            }
            return null;
        }
        public static String getInfo(int index) {
            for (RevenueType c : RevenueType.values()) {
                if (c.getKey() == index) {
                    return c.getInfo();
                }
            }
            return null;
@@ -500,7 +519,7 @@

        // 普通方法
        public static String getName(int index) {
            for (OrdersLog c : OrdersLog.values()) {
            for (workType c : workType.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
@@ -533,7 +552,7 @@
        accept(2, "已接单"),
        doing(3, "进行中"),
        done(4, "已完成"),
        cancel(99, "包装工"),
        cancel(99, "已取消"),
        ;
        // 成员变量
        private int key;