Merge remote-tracking branch 'origin/master'

rk

2025-09-28 2304d7b140c5c5b4bf3a83f9ced8bff37d20c42e

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

@@ -1,5 +1,6 @@
package com.doumee.core.constants;

import com.doumee.dao.business.model.Orders;
import lombok.AllArgsConstructor;
import lombok.Getter;

@@ -44,6 +45,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" ;
@@ -52,6 +56,8 @@
    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 AUTO_CONFIRM ="AUTO_CONFIRM" ;
    public static final String AUTO_CANCEL_WAIT_PAY ="AUTO_CANCEL_WAIT_PAY" ;

    public static final String QYWX = "QYWX";
    public static final  Integer ONE = 1;
@@ -64,6 +70,7 @@
    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 ;
@@ -71,6 +78,12 @@
    public static final String WORKORDER_LOG_FILE_PATH ="WORKORDER_LOG_FILE_PATH" ;

    public static final String REDIS_TOKEN_KEY = "token_";

    public static final String SUCCESS = "SUCCESS";
    public static final String FAIL = "FAIL";
    public static final String CANCELLED = "CANCELLED";


    public interface   uploadType{
        String blob = "blob";
        String ftp = "ftp";
@@ -82,7 +95,7 @@
    interface CacheKey {
    }
    public interface RedisKeys {
        public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
        public static final String ORDER_CODE = "ORDER_CODE";
    }
    /**
     * 操作类型，用于做接口验证分组
@@ -131,6 +144,12 @@
            d = 0L;
        }
        return d.longValue();
    }
    public static BigDecimal formatBigDecimal(BigDecimal d) {
        if (d == null) {
            new BigDecimal(0);
        }
        return d;
    }

    /**
@@ -354,9 +373,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)
        ;
@@ -376,6 +395,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;
@@ -409,6 +444,10 @@
        COMMENT(10, "发单方-评价完成","{userName}完成评价",0),
        SYSTEM_CANCEL(11, "系统-订单取消","系统取消",2),
        RELEASE_CANCEL(12, "发单方-订单取消","{userName}已手动取消订单",0),
        AUTO_COMMENT(13, "系统-自动评价","超出7日未评价，系统已自动评价",2),
        AUTO_AGREE(14, "系统-自动同意","接单方超时未处理，已自动同意",2),

        FEE_CONFIRM(15, "接单方-确认费用","{userName}已确认费用",1),

        ;
        // 成员变量
@@ -478,5 +517,241 @@
    }


    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 (workType c : workType.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;
        }

    }


    public  enum ordersStatus {
        waitPay(0, "待支付","待支付"),
        wait(1, "待接单","待接单"),
        accept(2, "已接单","已接单"),
        doing(3, "进行中","进行中"),
        done(4, "已完成","已完成"),
        feeconfirm(5, "待支付","待发单方支付"),//金额已确认
        cancel(99, "已取消","已取消"),
        ;
        // 成员变量
        private int key;
        private String name; //接单方文案
        private String info; //发单方文案
        // 构造方法
        ordersStatus(int key, String name,String info) {
            this.name = name;
            this.key = key;
            this.info = info;
        }

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

        public static String getInfo(int index) {
            for (ordersStatus c : ordersStatus.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 String getInfo() {
            return info;
        }

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

    }



    public  enum orderType {
        ygd(0, "用工单"),
        hyd(1, "货运单"),
        scd(2, "送餐单"),

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

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

        // 普通方法
        public static String getName(int index) {
            for (orderType c : orderType.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;
        }

    }



    public  enum smsContent {
        accept(0, "SMS_491325122","您的{order}订单已被接单！时间：{time1}-{time2}，可进入小程序联系接单方。"),
        receiveCancel(1, "SMS_491055243","您的{order}订单，时间：{time1}-{time2}，已被接单方取消，订单已重新进入接单大厅。"),
        platformCancel(2, "SMS_491375152","您的{order}订单，时间：{time1}-{time2},已由平台取消。如有疑问请联系客服。"),
        agreeUpd(3, "SMS_491190259","接单方已同意您将{order}的订单时间修改为{time1}至{time2}。"),
        disAgreeUpd(4, "SMS_491085252","接单方已拒绝您将{order}的订单时间修改为{time1}-{time2}。系统已重新将订单放入接单大厅。"),
        orderUpd(5, "SMS_491010267","请注意！您承接的{order}订单，客户将订单时间修改为{time1}-{time2}。请前往确认是否接受，超时不处理将视为同意。"),
        releaseCancel(6, "SMS_491150253","您承接的{order}订单，时间：{time1}-{time2}，已被发单方取消。您可前往接单大厅重新接单。"),
        platformCancel2(7, "SMS_491420143","您承接的{order}订单，时间：{time1}-{time2}，已由平台取消。如有疑问请联系客服。"),
        dispatch(8, "SMS_491180276","已为您智能匹配订单。订单类型：{order}，时间：{time1}-{time2}，距离：{distance}，预计费用{money}。请前往确认。"),
        pay(9, "SMS_491180278","您承接的{order}订单款项已到账！到账金额：{money}。可在小程序账户余额进行查看。"),
        authentication(10, "SMS_491055290","您申请的{authentication}的{order}认证{status}。请在小程序查看详情。"),
        ;
        // 成员变量
        private int key;
        private String code;
        private String name;

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

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

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

        public String getCode() {
            return code;
        }

        public void setCode(String code) {
            this.code = code;
        }

        public int getKey() {
            return key;
        }

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

    }


    public static  String getOrderInfo(Orders orders){
        String orderTypeInfo = "用工单";
        if(!Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            orderTypeInfo =   Constants.equalsInteger(orders.getType(),Constants.ONE)?"用车单":"送餐单";
        }else{
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                orderTypeInfo = orderTypeInfo + "-采摘工";
            }else{
                orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-分拣工":"-包装工");
            }
        }
        return orderTypeInfo;

    }



}