From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 19 +++++++++++++++++--
1 files changed, 17 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 4f7e4be..c7214b5 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
@@ -886,12 +886,27 @@
*/
@ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
@GetMapping(value = "/call")
- public R<String> call(@RequestParam Integer orderId) {
+ public R<String> call(@RequestParam("orderId") String orderId) {
Order order = orderService.getById(orderId);
if(Objects.isNull(order)){
return R.fail("订单不存在");
}
- order.setState(2);
+ if(order.getState() == 7){
+ order.setState(1);
+ orderService.updateById(order);
+ }
+ return R.ok();
+ }
+ /**
+ * 领取补贴金
+ */
+ @GetMapping(value = "/receiving")
+ public R<String> receiving(@RequestParam("orderId")String orderId, @RequestParam("recycleSubsidy")BigDecimal recycleSubsidy) {
+ Order order = orderService.getById(orderId);
+ if(Objects.isNull(order)){
+ return R.fail("订单不存在");
+ }
+ order.setSubsidy(recycleSubsidy);
orderService.updateById(order);
return R.ok();
}
--
Gitblit v1.7.1