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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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

@@ -7,6 +7,7 @@
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.payment.DeliveryOrderArriveDTO;
import com.mzl.flower.dto.request.payment.DeliveryOrderQueryDTO;
import com.mzl.flower.dto.request.payment.PostQueryDTO;
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.dto.response.supplier.SupplierOrderDTO;
import com.mzl.flower.service.payment.DeliveryOrderService;
@@ -104,13 +105,10 @@
        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getSupplierDeliveryOrderItem(id));
    }

    @GetMapping("/list/items/views")
    @PostMapping("/list/items/views")
    @ApiOperation(value = "获取商品详情列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "ids", value = "配送物品id列表", required = true, dataType = "String", paramType = "query")
    })
    public ResponseEntity<ReturnDataDTO<List<DeliveryOrderItemDTO>>> getSupplierDeliveryOrderItems(String ids){
        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getSupplierDeliveryOrderItems(ids));
    public ResponseEntity<ReturnDataDTO<List<DeliveryOrderItemDTO>>> getSupplierDeliveryOrderItems(@RequestBody PostQueryDTO dto){
        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getSupplierDeliveryOrderItems(dto));
    }

    @PostMapping("/list/arrive")
@@ -162,7 +160,7 @@
    })
    public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getReplaceCheck(String orderItemId){
        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId
                , Constants.CHECK_TYPE.replace.name()));
                , Constants.CHECK_TYPE.replace.name(), true));
    }

    @GetMapping("/mine/list/check/info/lack")
@@ -172,6 +170,6 @@
    })
    public ResponseEntity<ReturnDataDTO<OrderItemCheckNumDTO>> getLackCheck(String orderItemId){
        return returnData(R.SUCCESS.getCode(), deliveryOrderService.getOtherCheck(orderItemId
                , Constants.CHECK_TYPE.lack.name()));
                , Constants.CHECK_TYPE.lack.name(), true));
    }
}