From 1acfbca481fcb83935841f1c15db0faa813c27d9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 16:19:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7c847b0..d7c9cc0 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
@@ -131,9 +131,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{id}/{shopId}")
- public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
- orderService.writeOff(id, shopId);
+ @GetMapping("/writeOff/{id}/{shopId}/{technicianId}")
+ public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId, @PathVariable("technicianId") Integer technicianId){
+ orderService.writeOff(id, shopId, technicianId);
return R.ok();
}
@@ -298,7 +298,7 @@
List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
.eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
.between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
- .orderByDesc(Order::getCreateTime));
+ .orderByAsc(Order::getCreateTime));
Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
--
Gitblit v1.7.1