花农配送 时间查询

Cui Zhi Feng

2024-09-23 45ed134b1e2daa06b4708ade48efb7af78a029ea

花农配送 时间查询

 src/main/java/com/mzl/flower/dto/request/payment/DeliveryOrderQueryDTO.java

@@ -15,6 +15,9 @@
    @ApiModelProperty(value = "配送单状态; DELIVERY_ORDER_STATUS")
    private String status;

    @ApiModelProperty(value = "日期")
    private String date;

    @ApiModelProperty(hidden = true)
    private LocalDateTime startDate;


 src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java

@@ -120,7 +120,14 @@

    public Page<DeliveryOrderListDTO> selectDeliveryOrderList(Page page, DeliveryOrderQueryDTO dto) {
        Supplier s = getCurrentSupplier();
        if(Constants.DELIVERY_ORDER_STATUS.ARRIVED.name().equals(dto.getStatus())){
            List<String> statusLs = new ArrayList<>();
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.ARRIVED.name());
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.CHECKED.name());
            dto.setStatusList(statusLs);
        } else {
        dto.setStatusList(splitParam(dto.getStatus()));
        }
        List<DeliveryOrderListDTO> ls = deliveryOrderMapper.selectDoList(page, s.getId(), dto);
        if (ls != null && ls.size() > 0) {
            List<String> dIds = new ArrayList<>();

 src/main/java/com/mzl/flower/web/supplier/DeliverySupplierController.java

@@ -39,6 +39,13 @@
    @ApiOperation(value = "获取配送单列表")
    public ResponseEntity<ReturnDataDTO<Page<DeliveryOrderListDTO>>> selectOrderList(Page page
            , DeliveryOrderQueryDTO dto){
        LocalDate localDate = deliveryOrderService.parseLocalDate(dto.getDate());
        if(localDate != null){
            LocalDateTime endDate = localDate.atTime(17, 0, 0);
            LocalDateTime startDate = endDate.plusDays(-1);
            dto.setStartDate(startDate);
            dto.setEndDate(endDate);
        }
        return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectDeliveryOrderList(page, dto));
    }