From 49f2eff2cf52e0f1719dfad43cafff11b378252c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 十二月 2024 18:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 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 3a6b22c..0d1c3de 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
@@ -8,9 +8,11 @@
import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.enums.OrderStatus;
+import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
@@ -19,11 +21,17 @@
import com.ruoyi.other.api.feignClient.BaseSettingClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -47,6 +55,8 @@
private CommissionService commissionService;
@Resource
private BaseSettingClient baseSettingClient;
+ @Resource
+ private OrderMapper orderMapper;
/**
@@ -54,7 +64,7 @@
*/
@ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
@GetMapping("/getMyOrderList")
public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
@@ -76,7 +86,7 @@
*/
@ApiOperation(value = "订单详情", tags = {"小程序-个人中心-我的订单-订单详情"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/detail/{orderId}")
public R<OrderDetailVO> detail(@PathVariable("orderId") Long orderId){
@@ -103,7 +113,7 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String", paramType="query"),
+ @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
})
@GetMapping("/writeOff/{code}/{shopId}")
public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
@@ -116,7 +126,7 @@
*/
@ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/cancel/{orderId}")
public R<Void> cancel(@PathVariable("orderId") Long orderId){
@@ -131,7 +141,7 @@
*/
@ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/confirm/{orderId}")
public R<Void> confirm(@PathVariable("orderId") Long orderId){
@@ -162,7 +172,7 @@
*/
@ApiOperation(value = "更换收货地址", tags = {"小程序-个人中心-我的订单"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int", paramType="query"),
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
})
@GetMapping("/changeAddress")
public R<Void> changeAddress(@RequestParam("orderId") Long orderId, @RequestParam("addressId") Long addressId){
@@ -182,6 +192,9 @@
* 更新订单状态
*/
@ApiOperation(value = "更新订单状态", tags = {"后台-订单管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
+ })
@PostMapping("/updateOrderStatus")
public R<Void> updateOrderStatus(@RequestBody Order order){
Order order1 = orderService.getById(order.getId());
@@ -195,7 +208,7 @@
* 预约技师
*/
@PostMapping("/subscribe")
- public R<Void> subscribe(@RequestParam("id") Long id ,@RequestParam("technicianId") Integer technicianId){
+ public R<Void> subscribe(@RequestParam(value = "id", required = false) Long id ,@RequestParam(value = "technicianId", required = false) Integer technicianId){
Order order = orderService.getById(id);
order.setTechnicianId(technicianId);
orderService.updateById(order);
@@ -220,32 +233,22 @@
- @ResponseBody
- @GetMapping("/getOrderPageList")
- @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
- public TableDataInfo<OrderPageListVo> getOrderPageList(OrderPageList orderPageList){
- startPage();
- List<OrderPageListVo> list = orderService.getOrderPageList(orderPageList);
- return getDataTable(list);
- }
- @ResponseBody
- @PutMapping("/confirmDelivery/{orderId}")
+
+ @PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
- public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
- return orderService.confirmDelivery(orderId, code);
+ public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
+ return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
}
- @ResponseBody
@PutMapping("/cancelOrder/{orderId}")
@ApiOperation(value = "取消订单操作", tags = {"管理后台-订单管理"})
public R cancelOrder(@PathVariable("orderId") Long orderId){
return orderService.cancelOrder(orderId);
}
- @ResponseBody
@PutMapping("/receivingOperation/{orderId}")
@ApiOperation(value = "收货操作", tags = {"管理后台-订单管理"})
public R receivingOperation(@PathVariable("orderId") Long orderId){
@@ -253,7 +256,6 @@
}
- @ResponseBody
@GetMapping("/getOrderInfo/{orderId}")
@ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
@@ -262,6 +264,47 @@
}
-
+ @GetMapping("/getOrderPageList")
+// @ApiOperation(value = "获取订单列表", tags = {"管理后台-订单管理", "门店后台-订单管理"})
+ public R<PageInfo<OrderPageListVo>> getOrderPageList(OrderPageList orderPageList){
+ return R.ok(orderService.getOrderPageList(orderPageList));
+ }
+
+ /**
+ * 订单统计
+ */
+ @GetMapping("/getOrderStatistics")
+ @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
+ public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime){
+
+ List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
+ Map<String, List<Order>> orderMap = orderList.stream()
+ .collect(Collectors.groupingBy(o -> o.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+
+ Map<String, Integer> serviceOrderMap = new HashMap<>();
+ Map<String, Integer> singleOrderMap = new HashMap<>();
+ Map<String, Integer> totalOrderMap = new HashMap<>();
+
+ orderMap.forEach((date, orders) -> {
+ long serviceCount = orders.stream().filter(o -> o.getOrderType() == 1).count();
+ long singleCount = orders.stream().filter(o -> o.getOrderType() == 2).count();
+ long totalCount = orders.size();
+
+ serviceOrderMap.put(date, (int) serviceCount);
+ singleOrderMap.put(date, (int) singleCount);
+ totalOrderMap.put(date, (int) totalCount);
+ });
+
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
+ orderStatistics.setServiceOrderMap(serviceOrderMap);
+ orderStatistics.setSingleOrderMap(singleOrderMap);
+ orderStatistics.setTotalOrderMap(totalOrderMap);
+
+ return R.ok(orderStatistics);
+ }
+
+
}
--
Gitblit v1.7.1