From a0a29587681bed434199487a1912940229f71385 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 10:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 a62c6df..47148b8 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")
+ public R<Void> writeOff(String code, Integer shopId, String technicianId){
+ orderService.writeOff(code, shopId, technicianId);
return R.ok();
}
@@ -250,7 +250,7 @@
@PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
- return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
+ return orderService.confirmDelivery(confirmDelivery);
}
@@ -301,8 +301,12 @@
.orderByAsc(Order::getCreateTime));
- Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ Map<String, List<Order>> map = orderList.stream()
+ .collect(Collectors.groupingBy(
+ item -> item.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
+ TreeMap::new, // 使用 TreeMap 按键排序
+ Collectors.toList()
+ ));
List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
map.forEach((key, value) -> {
@@ -317,12 +321,14 @@
if (order.getOrderType().equals(1)) {
serviceTotal++;
serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
- }else if (order.getOrderType().equals(2)){
+ total++;
+ totalMoney = totalMoney.add(order.getPaymentAmount());
+ }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){
singleTotal++;
singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getPaymentAmount());
}
- total++;
- totalMoney = totalMoney.add(order.getPaymentAmount());
}
orderStatisticsDetail.setDate(key);
orderStatisticsDetail.setServiceTotal(serviceTotal);
--
Gitblit v1.7.1