From f4f37ee0685ef5d26f8b4dd7d78074d8c815cbcc Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 13 Jul 2022 11:11:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 29 +++++++++++++++ .../web/pojo/vo/OrderStatisticsRequest.java | 14 ++++++++ .../web/pojo/vo/OrderStatisticsResponse.java | 15 ++++++++ .../ghy/order/mapper/OrderMasterMapper.java | 6 ++++ .../ghy/order/service/OrderMasterService.java | 5 +++ .../service/impl/OrderMasterServiceImpl.java | 5 +++ .../mapper/order/OrderMasterMapper.xml | 36 +++++++++++++++++++ 7 files changed, 110 insertions(+) create mode 100644 ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java create mode 100644 ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 57b129b2..52a062c3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -27,8 +27,11 @@ import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.service.FinancialDetailService; import com.ghy.payment.service.FinancialMasterService; +import com.ghy.web.pojo.vo.OrderStatisticsRequest; +import com.ghy.web.pojo.vo.OrderStatisticsResponse; import com.ghy.worker.domain.Worker; import com.ghy.worker.service.WorkerService; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -353,4 +356,30 @@ public class OrderController extends BaseController { financialDetailService.insertFinancialDetail(financialDetail); } + /** + * 订单统计 + * */ + @PostMapping("/app/statistics") + @ResponseBody + public AjaxResult orderStatistics(@RequestBody OrderStatisticsRequest request) { + OrderStatisticsResponse response = new OrderStatisticsResponse(); + + try { + OrderMaster orderMaster = new OrderMaster(); + orderMaster.setOrderStatus(OrderStatus.RECEIVE.code()); + orderMaster.setWorkerId(request.getWorkerId()); + // 统计新订单的单量 + response.setNewOrderNum(orderMasterService.countOrderMasterList(orderMaster)); + // 统计未排的单量 + orderMaster.setOrderStatus(OrderStatus.PLAIN.code()); + response.setPlanOrderNum(orderMasterService.countOrderMasterList(orderMaster)); + } catch (Exception e) { + e.printStackTrace(); + logger.error(ExceptionUtils.getStackTrace(e)); + return AjaxResult.error(e.getMessage()); + } + + return AjaxResult.success(response); + } + } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java new file mode 100644 index 00000000..98811874 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsRequest.java @@ -0,0 +1,14 @@ +package com.ghy.web.pojo.vo; + +import lombok.Data; + +/** + * 订单统计请求对象 + * + * @author ydq + * @date : 2022-07-12 22:59 + */ +@Data +public class OrderStatisticsRequest { + private Long workerId; +} diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java new file mode 100644 index 00000000..967f3283 --- /dev/null +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java @@ -0,0 +1,15 @@ +package com.ghy.web.pojo.vo; + +import lombok.Data; + +/** + * 订单统计响应对象 + * + * @author ydq + * @date : 2022-07-12 22:59 + */ +@Data +public class OrderStatisticsResponse { + private long planOrderNum; + private long newOrderNum; +} diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java index 7b6f8b71..00f3d1bd 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderMasterMapper.java @@ -31,6 +31,12 @@ public interface OrderMasterMapper { */ List selectOrderMasterList(OrderMaster orderMaster); + /** + * @param orderMaster 主订单入参 + * @return 满足条件的主单单量 + * */ + Long countOrderMasterList(OrderMaster orderMaster); + /** * @param orderMasterId 主订单id * @return 主订单 diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index cea698b6..81197684 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -34,6 +34,11 @@ public interface OrderMasterService { */ List selectOrderMasterList(OrderMaster orderMaster); + /** + * @param orderMaster 主订单入参 + * @return 满足条件的主单单量 + * */ + Long countOrderMasterList(OrderMaster orderMaster); /** * @param orderMasterId 主订单id diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 542fa00d..5c9469bd 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -59,6 +59,11 @@ public class OrderMasterServiceImpl implements OrderMasterService { return orderMasterMapper.selectOrderMasterList(orderMaster); } + @Override + public Long countOrderMasterList(OrderMaster orderMaster) { + return orderMasterMapper.countOrderMasterList(orderMaster); + } + @Override public OrderMaster selectById(Long orderMasterId) { return orderMasterMapper.selectById(orderMasterId); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 497b6cc3..5f930789 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -127,6 +127,42 @@ + +