111

k94314517

2025-07-16 3866617456dcec496400ba3e31831dce99003ffa

111

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

@@ -99,6 +99,7 @@
    @ApiModelProperty(value = "费用标准", example = "1")
    private Long price;


    @ApiModelProperty(value = "预估费用", example = "1")
    private Long estimatedAccount;

@@ -203,6 +204,12 @@
    @ApiModelProperty(value = "取消类型：0=发单方无责取消；1=发单方有责取消；2=系统取消；", example = "1")
    private Integer cancelType;

    @ApiModelProperty(value = "支付方式：0=微信；1=其他", example = "1")
    private Integer payMethod;

    @ApiModelProperty(value = "支付时间", example = "1")
    private Date payTime;

    @ApiModelProperty(value = "图片")
    @TableField(exist = false)
    private List<Multifile> multifileList;
@@ -280,6 +287,9 @@
    @TableField(exist = false)
    private Date createTimeEnd;

    @ApiModelProperty(value = "费用标准单位", example = "1")
    @TableField(exist = false)
    private String priceUnit;


    @ApiModelProperty(value = "接单时间起")

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

@@ -387,6 +387,28 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));

        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                orders.setPriceUnit("元/斤");
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                orders.setPriceUnit("元/人*天");
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                    orders.setPriceUnit("元/人*天");
                }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    orders.setPriceUnit("元/人*小时");
                }else{
                    orders.setPriceUnit("元/斤");
                }
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                orders.setPriceUnit("元/天");
            }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                orders.setPriceUnit("元/次");
            }
        }
        //附件信息
        List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
@@ -1066,6 +1088,8 @@
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getStatus,Constants.ordersStatus.wait)
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getPayTime,"now()")
                        .set(Orders::getPayMethod,Constants.ZERO)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .eq(Orders::getId,orders.getId())
                );
@@ -1085,6 +1109,8 @@
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getStatus,Constants.FOUR)
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getPayTime,"now()")
                        .set(Orders::getPayMethod,Constants.ZERO)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .set(Orders::getFinishTime,"now()")
                        .eq(Orders::getId,orders.getId())
@@ -1324,6 +1350,14 @@

    //todo 自动派单
    public void autoGrabOrders(){
//        String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_DISPATCH_DISTANCE).getCode();
//        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
//                .eq(Orders::getStatus,Constants.FOUR).eq(Orders::getCommentStatus,Constants.ZERO)
//                .apply(" DATE_ADD(finish_time, INTERVAL 7 DAY) < now() ")
//                .last("limit 100")
//        );




    }