From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 0e2b70b..32f12f1 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
@@ -754,6 +755,7 @@
order.setCompleteTime(new Date());
order.setState(Constants.THREE);
order.setFake(orderSubmitRequest.getFake());
+ order.setRemark(orderSubmitRequest.getRemark());
boolean update = orderService.updateById(order);
// 服务记录
ServeRecord serveRecord = new ServeRecord();
@@ -907,8 +909,20 @@
return R.fail("订单不存在");
}
order.setSubsidy(recycleSubsidy);
+ order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));
orderService.updateById(order);
return R.ok();
}
+ /**
+ * 领取补贴金
+ */
+ @GetMapping(value = "/getTodayOrderData")
+ public R<List<Order>> getTodayOrderData() {
+ List<Order> orders = orderService.list(Wrappers.lambdaQuery(Order.class)
+ .eq(Order::getTime, LocalDate.now())
+ .eq(Order::getIsDelete, 0));
+ return R.ok(orders);
+ }
+
}
--
Gitblit v1.7.1