From 45ee79cc6dbabb6f9fde3b310c424e47c037cb2f Mon Sep 17 00:00:00 2001 From: cb <642514070@qq.com> Date: Wed, 30 Apr 2025 09:33:10 +0800 Subject: [PATCH 1/4] no message --- .../com/ghy/web/controller/order/OrderMasterController.java | 2 ++ .../java/com/ghy/order/service/impl/OrderMasterServiceImpl.java | 1 + 2 files changed, 3 insertions(+) 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 4083691e..f66d497a 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 @@ -907,6 +907,8 @@ public class OrderMasterController extends BaseController { @PostMapping("/app/count") @ResponseBody public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) { + logger.info("传入的主单数据{}", orderMaster); + logger.info("获取到的主单数量{}", orderMasterService.countOrderMasterList(orderMaster)); return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); } 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 23c35b26..15b196df 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 @@ -125,6 +125,7 @@ public class OrderMasterServiceImpl implements OrderMasterService { @Override public Long countOrderMasterList(OrderMaster orderMaster) { + return orderMasterMapper.countOrderMasterList(orderMaster); } From 63f85c996f68ca78d5493d0a958a44eb0c50d67d Mon Sep 17 00:00:00 2001 From: cb <642514070@qq.com> Date: Wed, 30 Apr 2025 09:37:36 +0800 Subject: [PATCH 2/4] Revert "no message" This reverts commit 45ee79cc6dbabb6f9fde3b310c424e47c037cb2f. --- .../com/ghy/web/controller/order/OrderMasterController.java | 2 -- .../java/com/ghy/order/service/impl/OrderMasterServiceImpl.java | 1 - 2 files changed, 3 deletions(-) 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 f66d497a..4083691e 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 @@ -907,8 +907,6 @@ public class OrderMasterController extends BaseController { @PostMapping("/app/count") @ResponseBody public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) { - logger.info("传入的主单数据{}", orderMaster); - logger.info("获取到的主单数量{}", orderMasterService.countOrderMasterList(orderMaster)); return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); } 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 15b196df..23c35b26 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 @@ -125,7 +125,6 @@ public class OrderMasterServiceImpl implements OrderMasterService { @Override public Long countOrderMasterList(OrderMaster orderMaster) { - return orderMasterMapper.countOrderMasterList(orderMaster); } From fabfbad8e3932aa4cad4cf1c159df81c70c2cff3 Mon Sep 17 00:00:00 2001 From: cb <642514070@qq.com> Date: Wed, 30 Apr 2025 09:38:05 +0800 Subject: [PATCH 3/4] Reapply "no message" This reverts commit 63f85c996f68ca78d5493d0a958a44eb0c50d67d. --- .../com/ghy/web/controller/order/OrderMasterController.java | 2 ++ .../java/com/ghy/order/service/impl/OrderMasterServiceImpl.java | 1 + 2 files changed, 3 insertions(+) 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 4083691e..f66d497a 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 @@ -907,6 +907,8 @@ public class OrderMasterController extends BaseController { @PostMapping("/app/count") @ResponseBody public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) { + logger.info("传入的主单数据{}", orderMaster); + logger.info("获取到的主单数量{}", orderMasterService.countOrderMasterList(orderMaster)); return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster)); } 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 23c35b26..15b196df 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 @@ -125,6 +125,7 @@ public class OrderMasterServiceImpl implements OrderMasterService { @Override public Long countOrderMasterList(OrderMaster orderMaster) { + return orderMasterMapper.countOrderMasterList(orderMaster); } From 9df61f6a85ec8c8c505a29e069c4bcc8738a8448 Mon Sep 17 00:00:00 2001 From: cb <642514070@qq.com> Date: Wed, 30 Apr 2025 21:57:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 9eb3f89c..176594f0 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -132,7 +132,7 @@ om.goods_brand, om.goods_specification, om.consult_mode, - om.insurance_id + om.insurance_id, om.province_id, om.city_id , om.country_id,