111

k94314517

2025-07-15 25ef334e692ff6a3119fb906b08f2869649cd1c7

111

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

@@ -533,7 +533,7 @@
        accept(2, "已接单"),
        doing(3, "进行中"),
        done(4, "已完成"),
        cancel(99, "包装工"),
        cancel(99, "已取消"),
        ;
        // 成员变量
        private int key;

 server/services/src/main/java/com/doumee/dao/business/model/Orders.java

@@ -102,8 +102,10 @@
    @ApiModelProperty(value = "预估费用", example = "1")
    private Long estimatedAccount;


    @ApiModelProperty(value = "实际支付费用", example = "1")
    private Long payAccount;


    @ApiModelProperty(value = "实收费用", example = "1")
    private Long receiveAccount;
@@ -151,6 +153,7 @@
    private Integer acceptMemberId;

    @ApiModelProperty(value = "接单类型:0=手动接单；1=系统派单；", example = "1")
    @ExcelColumn(name = "接单方式",index = 14,width = 10,valueMapping = "0=手动接单;1=系统派单;")
    private Integer acceptType;

    @ApiModelProperty(value = "开始作业时间")
@@ -288,6 +291,15 @@
    private Date acceptTimeEnd;


    @ApiModelProperty(hidden = true)
    @TableField(exist = false)
    @ExcelColumn(name = "预估金额（元）",index = 12,width = 10)
    private double estimatedAccountYuan;

    @ApiModelProperty(hidden = true)
    @TableField(exist = false)
    @ExcelColumn(name = "实付金额（元）",index = 13,width = 10)
    private double payAccountYuan;

    @ApiModelProperty(value = "完成时间起")
    @TableField(exist = false)

 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java

@@ -465,6 +465,8 @@
        for (Orders orders:iPage.getRecords()) {
           this.getOrderContent(orders);
           orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
           orders.setEstimatedAccountYuan(Objects.nonNull(orders.getEstimatedAccount())&&orders.getEstimatedAccount()>0?orders.getEstimatedAccount()/100:0L);
           orders.setPayAccountYuan(Objects.nonNull(orders.getPayAccount())&&orders.getPayAccount()>0?orders.getPayAccount()/100:0L);
        }
        return PageData.from(iPage);
    }
@@ -473,23 +475,40 @@
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            orders.setOrderContent(Constants.workType.getName(orders.getWorkType()) +" | " + orders.getCategoryName());
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum1())){
                orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"斤");
                }
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"人");
                }
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)||Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"人");
                    }
                }else{
                    if(Objects.nonNull(orders.getPriceNum1())) {
                    orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"斤");
                    }
                }
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            orders.setOrderContent(  orders.getCategoryName() + " | " + orders.getTransportTypeName() +" | " + orders.getTransportNum() +"斤");
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getCategoryName())){
                orders.setOrderContent(  orders.getCategoryName() +
                        (StringUtils.isEmpty(orders.getTransportTypeName())?"":" | " + orders.getTransportTypeName() ) +
                        (Objects.isNull(orders.getTransportNum())?null:" | " + orders.getTransportNum() +"斤"));
            }

            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                orders.setOrderContent(orders.getOrderContent()+" | 用车" +orders.getPriceNum2()+"天");
                }
            }else{
                if(Objects.nonNull(orders.getPriceNum2())) {
                orders.setOrderContent(orders.getOrderContent()+" | 用车" +orders.getPriceNum2()+"次");
            }
            }
        }else{
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getWayInfo())){
                List<CateringDTO> cateringDTOList = JSONArray.parseArray(orders.getWayInfo(),CateringDTO.class);