Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-10 2aae6068bbf1aff1ffb2813098553ac632d5002b

 src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java

@@ -136,6 +136,14 @@
    @ApiOperation(value = "查询集货站供应商配送列表")
    public ResponseEntity<ReturnDataDTO<Page<DeliveryOrderList4CheckDTO>>> selectSupplierDoList4Check(Page page
            , DeliveryOrderStationQueryDTO dto){
        LocalDate localDate = deliveryOrderService.parseLocalDate(dto.getDate());
        if(localDate != null){
            LocalDateTime end = localDate.atTime(17, 0, 0);
            LocalDateTime begin = end.plusDays(-1);
            dto.setStartDate(begin);
            dto.setEndDate(end);
        }

        return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectSupplierDoList4Check(page, dto));
    }

@@ -179,6 +187,14 @@
    @ApiOperation(value = "查询供应商配送单列表")
    public ResponseEntity<ReturnDataDTO<Page<DeliveryOrder4CheckDTO>>> selectSupplierDoInfo4Check(Page page
            , DeliveryOrderInfoSpQueryDTO dto){
        LocalDate localDate = deliveryOrderService.parseLocalDate(dto.getDate());
        if(localDate != null){
            LocalDateTime end = localDate.atTime(17, 0, 0);
            LocalDateTime begin = end.plusDays(-1);
            dto.setStartDate(begin);
            dto.setEndDate(end);
        }

        return returnData(R.SUCCESS.getCode(), deliveryOrderService.selectSupplierDoInfo4Check(page, dto));
    }

@@ -242,7 +258,8 @@
    @ApiOperation(value = "降级操作")
    public ResponseEntity<ReturnDataDTO> doReduceCheck(@RequestBody OrderItemCheckCommitReduceDTO dto) {
        deliveryOrderService.doReduceCheck(dto);
        deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
        String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }

@@ -251,7 +268,8 @@
    public ResponseEntity<ReturnDataDTO> doReplaceCheck(@RequestBody OrderItemCheckCommitDTO dto) {
        dto.setType(Constants.CHECK_TYPE.replace.name());
        deliveryOrderService.doCheck(dto, null, null, null);
        deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
        String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }

@@ -260,7 +278,8 @@
    public ResponseEntity<ReturnDataDTO> doLackCheck(@RequestBody OrderItemCheckCommitDTO dto) {
        dto.setType(Constants.CHECK_TYPE.lack.name());
        deliveryOrderService.doCheck(dto, null, null, null);
        deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
        String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId());
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }

@@ -268,7 +287,8 @@
    @ApiOperation(value = "删除降级信息")
    public ResponseEntity<ReturnDataDTO> deleteReduce(String orderItemId){
        deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.reduce.name());
        deliveryOrderService.checkOrderItemStatus(orderItemId);
        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }

@@ -276,7 +296,8 @@
    @ApiOperation(value = "删除补货信息")
    public ResponseEntity<ReturnDataDTO> deleteReplace(String orderItemId){
        deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.replace.name());
        deliveryOrderService.checkOrderItemStatus(orderItemId);
        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }

@@ -284,7 +305,8 @@
    @ApiOperation(value = "删除缺货信息")
    public ResponseEntity<ReturnDataDTO> deleteLack(String orderItemId){
        deliveryOrderService.deleteCheckInfo(orderItemId, Constants.CHECK_TYPE.lack.name());
        deliveryOrderService.checkOrderItemStatus(orderItemId);
        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }

@@ -292,6 +314,8 @@
    @ApiOperation(value = "完成商品质检")
    public ResponseEntity<ReturnDataDTO> setCheckOk(String orderItemId){
        deliveryOrderService.setCheckOk(orderItemId);
        String orderId = deliveryOrderService.checkOrderItemStatus(orderItemId);
        deliveryOrderService.checkOrderStatus(orderId);
        return returnData(R.SUCCESS.getCode(), null);
    }