From d65dedb62d0b6237d94834b08a68895de1f49427 Mon Sep 17 00:00:00 2001 From: donqi Date: Wed, 7 Jun 2023 23:24:58 +0800 Subject: [PATCH] feat --- .../order/OrderMasterController.java | 12 ++ .../templates/goods/standard/addTemplate.html | 141 ++++++++++-------- .../resources/templates/order/pc-master.html | 132 +++++++++++++++- .../ghy/order/domain/OrderMasterCount.java | 23 +++ .../ghy/order/mapper/OrderMasterMapper.java | 3 + .../ghy/order/service/OrderMasterService.java | 3 + .../service/impl/OrderMasterServiceImpl.java | 6 + .../mapper/order/OrderMasterMapper.xml | 35 ++++- 8 files changed, 287 insertions(+), 68 deletions(-) create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 2cd1e492..c2103bd5 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -875,4 +875,16 @@ public class OrderMasterController extends BaseController { int i = orderMasterService.reject(orderMaster); return AjaxResult.success(i); } + + @GetMapping("/differentStatus/count") + @ResponseBody + public AjaxResult differentStatusOrderCount() { + return AjaxResult.success(orderMasterService.differentStatusOrderCount()); + } + + @GetMapping("/count") + @ResponseBody + public AjaxResult OrderMasterCount(OrderMaster orderMaster) { + return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); + } } diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 8abb6c3e..c862e36f 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -2,6 +2,7 @@ +