From e0623f1a914ecbc99d5926c0df3cf26032c02499 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 17:11:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 dd4d036..25fc793 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
@@ -147,13 +147,6 @@
})
@GetMapping("/confirm/{orderId}")
public R<Void> confirm(@PathVariable("orderId") Long orderId){
- boolean update = orderService.update(new LambdaUpdateWrapper<Order>()
- .eq(Order::getId, orderId)
- .eq(Order::getOrderStatus, OrderStatus.PENDING_RECEIPT.getCode())
- .set(Order::getOrderStatus, OrderStatus.COMPLETED.getCode()));
- if(!update){
- return R.fail("订单状态异常");
- }
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
if (R.isError(baseSettingR)) {
return R.fail("售后设置获取失败");
@@ -165,7 +158,11 @@
String content = baseSetting.getContent();
JSONObject jsonObject = JSONObject.parseObject(content);
Long days = jsonObject.getLong("days");
- commissionService.addToCommissionDelayQueue(orderId, LocalDateTime.now().plusDays(days));
+ Order order = orderService.getById(orderId);
+ order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ order.setIsCommission(0);
+ order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+ orderService.updateById(order);
return R.ok();
}
@@ -230,7 +227,7 @@
}
@PostMapping("/byShopId")
public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
- return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).groupBy(Order::getAppUserId).list());
+ return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).list());
}
@@ -281,7 +278,7 @@
@RequestParam("endTime") String endTime){
List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
- .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
+ .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"))));
Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
@@ -313,8 +310,10 @@
orderStatisticsDetail.setTotal(total);
orderStatisticsDetails.add(orderStatisticsDetail);
});
- OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
- orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
+ if(null != orderStatistics){
+ orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ }
return R.ok(orderStatistics);
}
--
Gitblit v1.7.1