From 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期六, 12 十月 2024 11:09:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2 --- src/main/java/com/mzl/flower/web/payment/OrderController.java | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/payment/OrderController.java b/src/main/java/com/mzl/flower/web/payment/OrderController.java index a523e87..0d9d2d6 100644 --- a/src/main/java/com/mzl/flower/web/payment/OrderController.java +++ b/src/main/java/com/mzl/flower/web/payment/OrderController.java @@ -5,9 +5,9 @@ import com.mzl.flower.base.R; import com.mzl.flower.base.ReturnDataDTO; import com.mzl.flower.constant.Constants; +import com.mzl.flower.dto.request.payment.OrderAddressUpdateDTO; import com.mzl.flower.dto.request.payment.OrderDeliveryNoDTO; import com.mzl.flower.dto.request.payment.OrderQueryDTO; -import com.mzl.flower.dto.request.payment.OrderReduceDTO; import com.mzl.flower.dto.response.payment.*; import com.mzl.flower.service.payment.DeliveryOrderService; import com.mzl.flower.service.payment.OrderService; @@ -22,6 +22,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; @RestController @@ -51,7 +52,6 @@ public ResponseEntity<ReturnDataDTO<Page<OrderPlatformListDTO>>> selectOrderList(Page page, OrderQueryDTO dto){ return returnData(R.SUCCESS.getCode(), orderService.selectOrderPlatformList(page, dto)); } - @GetMapping("/list/view") @ApiOperation(value = "订单详情") @ApiImplicitParams({ @@ -109,7 +109,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(), false)); } @GetMapping("/list/check/info/lack") @@ -119,7 +119,7 @@ }) 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(), false)); } @GetMapping("/list/check/info/agree") @@ -163,6 +163,13 @@ return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckList(dto)); } + @PostMapping("/check/location/list") + @ApiOperation(value = "查询订单清单列表-按库位分商品") + public ResponseEntity<ReturnDataDTO<List<OrderCheckLocationListDTO>>> selectOrderCheckLocationList( + @RequestBody OrderQueryDTO dto){ + return returnData(R.SUCCESS.getCode(), orderService.selectOrderCheckLocationList(dto)); + } + @GetMapping(value = "/refund") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"), @@ -174,4 +181,16 @@ return returnData(R.SUCCESS.getCode(), null); } + @PostMapping("/page/update") + @ApiOperation(value = "订单修改", notes = "订单修改") + public ResponseEntity<ReturnDataDTO> operationUpdate(@Validated @RequestBody OrderAddressUpdateDTO dto) { + orderService.operationUpdate(dto); + return returnData(R.SUCCESS.getCode(),null); + } + + @GetMapping("/list/export") + @ApiOperation(value = "订单导出") + public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO queryOrderDTO) { + orderService.exportOrderDetail(response, queryOrderDTO); + } } -- Gitblit v1.9.3