From 72cf5cdaef3be1e81da7f59d6ed61fe368f44816 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 08 一月 2025 14:48:46 +0800 Subject: [PATCH] add:物流发货针对散户更改微信发货方式,保存物流单号,未发送之前可更改 --- src/main/java/com/mzl/flower/web/payment/OrderController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 5 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..8cf080b 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,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; import java.util.List; @RestController @@ -46,12 +48,17 @@ return returnData(R.SUCCESS.getCode(), orderService.getOrderStatusCount(dto)); } + @GetMapping("/abnormal/status/count") + @ApiOperation(value = "获取异常订单状态数量") + public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getAbnormalOrderStatusCount(OrderQueryDTO dto){ + return returnData(R.SUCCESS.getCode(), orderService.getAbnormalOrderStatusCount(dto)); + } + @GetMapping("/list") @ApiOperation(value = "查询订单列表") 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({ @@ -77,6 +84,13 @@ return returnData(R.SUCCESS.getCode(), null); } + + @PostMapping("/list/saveDeliveryNo") + @ApiOperation(value = "没有合伙人的花店上传快递号保存但是不发货") + public ResponseEntity<ReturnDataDTO> saveDeliveryNoInfo(@RequestBody OrderDeliveryNoDTO dto) { + orderService.saveDeliveryNoInfo(dto); + return returnData(R.SUCCESS.getCode(), null); + } @GetMapping("/list/abnormal/details") @ApiOperation(value = "异常订单明细") @ApiImplicitParams({ @@ -88,7 +102,7 @@ @GetMapping("/list/abnormal/process") @ApiOperation(value = "异常订单处理(不管有没有退款金额,建议都要处理)") - public ResponseEntity<ReturnDataDTO> processLevelDown(String id) { + public ResponseEntity<ReturnDataDTO> processLevelDown(String id) throws Exception { orderService.processAbnormalOrder(id); return returnData(R.SUCCESS.getCode(), null); } @@ -109,7 +123,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 +133,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 +177,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 +195,30 @@ 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); + } + + @GetMapping("/time/now") + @ApiOperation(value = "订单导出") + public ResponseEntity<Long> getNowTime() { + return returnData(R.SUCCESS.getCode(),System.currentTimeMillis()); + } + + @GetMapping("/elk/date") + @ApiOperation(value = "订单日期刷新") + public ResponseEntity<Long> getElkDate() { + orderService.refreshDate(); + return returnData(R.SUCCESS.getCode(),System.currentTimeMillis()); + } + } -- Gitblit v1.9.3