From b9da8289051937fbbbd47bbda97414ad6c769a90 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 18 七月 2024 14:37:00 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index c332288..eab7821 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -99,6 +99,18 @@
}
/**
+ * 更改订单状态且清空到达时间
+ */
+ @ApiOperation(value = "订单列表-更改订单状态且清空到达时间", tags = {"后台-订单管理"})
+ @PostMapping(value = "/updateStateAndArrivalTime")
+ public R<Boolean> updateStateAndArrivalTime(@RequestParam("orderId") String orderId,
+ @RequestParam("state") Integer state) {
+ return R.ok(orderService.lambdaUpdate()
+ .eq(Order::getId, orderId).set(Order::getState, state)
+ .set(Order::getArriveTime, null).update());
+ }
+
+ /**
* 更改订单提现状态
*/
@ApiOperation(value = "订单列表-更改订单提现状态", tags = {"后台-订单管理"})
@@ -235,6 +247,7 @@
order.setSiteName(orderRequest.getSiteName());
order.setServeId(orderRequest.getServeId());
order.setServeName(orderRequest.getServeName());
+ order.setServePrice(orderRequest.getServePrice());
order.setSiteName(orderRequest.getSiteName());
// 预约信息
order.setReservationName(orderRequest.getReservationName());
@@ -441,8 +454,6 @@
public R<OrderDetailVO> orderDetail(@RequestParam("orderId") String orderId) {
// 订单信息
Order order = orderService.lambdaQuery().eq(Order::getId, orderId).eq(Order::getIsDelete, 0).one();
- // 获取回收服务封面
-
// 服务信息(服务备注、上门时间、完成时间、完成所拍现场照片)
ServeRecord serveRecord = serveRecordService.lambdaQuery().eq(ServeRecord::getOrderId, orderId)
.eq(ServeRecord::getIsDelete, 0).one();
--
Gitblit v1.7.1