From 6172a682abd46f76d4f083782bc383daae05bb96 Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 27 Mar 2023 22:20:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=8F=8A=E8=AE=A2=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=8E=92=E9=99=A4workFinishTime?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 2 ++ .../src/main/java/com/ghy/order/domain/OrderDetail.java | 2 ++ .../src/main/resources/mapper/order/OrderDetailMapper.xml | 6 ++++++ 3 files changed, 10 insertions(+) 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 d96e8600..3eb92efc 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 @@ -662,7 +662,9 @@ public class OrderController extends BaseController { response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail)); // 统计待确认单量 orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code()); + orderDetail.setWorkFinishTimeExisted(true); response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail)); + orderDetail.setWorkFinishTimeExisted(false); // 统计已完成子单量 orderDetail.setOrderStatus(OrderStatus.FINISH.code()); response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index c8b5733a..c12ed3be 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -128,4 +128,6 @@ public class OrderDetail extends BaseEntity { private BigDecimal financialMasterMoney; private BigDecimal financialDetailMoney; private BigDecimal changeMoney; + + private boolean workFinishTimeExisted; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index b253d43a..e9788e59 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -140,6 +140,9 @@ AND od.draw_cash_status = ${drawCashStatus} + + AND od.work_finish_time is not null + order by od.create_time @@ -193,6 +196,9 @@ AND od.shelve_status = ${shelveStatus} + + AND od.work_finish_time is not null + order by od.create_time From 18957b09ef30b8ebc3485a4a78a464d6eb50a3ec Mon Sep 17 00:00:00 2001 From: donqi Date: Tue, 28 Mar 2023 00:53:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderController.java | 12 ++++++++++-- .../main/java/com/ghy/order/domain/OrderDetail.java | 2 ++ .../resources/mapper/order/OrderDetailMapper.xml | 12 ++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) 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 3eb92efc..3c1ad706 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 @@ -661,13 +661,21 @@ public class OrderController extends BaseController { orderDetail.setOrderStatus(OrderStatus.SERVER.code()); response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail)); // 统计待确认单量 - orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code()); + orderDetail.setOrderStatus(null); orderDetail.setWorkFinishTimeExisted(true); + orderDetail.setDrawCashStatusList(new ArrayList(){{ + add(0); + add(1); + }}); response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail)); - orderDetail.setWorkFinishTimeExisted(false); // 统计已完成子单量 orderDetail.setOrderStatus(OrderStatus.FINISH.code()); + orderDetail.setDrawCashStatusList(new ArrayList(){{ + add(2); + }}); response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); + orderDetail.setWorkFinishTimeExisted(false); + orderDetail.setDrawCashStatusList(null); // 统计已完成主单量 orderMaster.setOrderStatus(OrderStatus.FINISH.code()); response.setFinishedMasterOrderNum(orderMasterService.countOrderMasterList(orderMaster)); diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java index c12ed3be..4d8b1aac 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -107,6 +107,8 @@ public class OrderDetail extends BaseEntity { */ private Integer drawCashStatus; + private List drawCashStatusList; + /** * 发起提现时间 draw_cash_time */ diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index e9788e59..d96f286b 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -140,6 +140,12 @@ AND od.draw_cash_status = ${drawCashStatus} + + AND od.draw_cash_status in + + #{drawCashStatus} + + AND od.work_finish_time is not null @@ -199,6 +205,12 @@ AND od.work_finish_time is not null + + AND od.draw_cash_status in + + #{drawCashStatus} + + order by od.create_time From 2be3c62d62dc5a69ac1bf4c3e70f630083366260 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Tue, 28 Mar 2023 21:56:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=80=80=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=88=96=E8=80=85=E6=9C=AA=E7=BA=A6=E6=9C=AA=E6=8E=92?= =?UTF-8?q?=E4=B8=BB=E5=8D=95=E4=BC=9A=E5=A4=B1=E8=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/quartz/service/impl/OrderServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index 88a6e67f..8d156f5c 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -181,6 +181,10 @@ public class OrderServiceImpl implements OrderService { try { List ods = orderDetailService.selectByOrderMasterId(om.getId()); Set statusSet = ods.stream().map(OrderDetail::getOrderStatus).collect(Collectors.toSet()); + // 没有子单,未派单的情况不刷新主单状态 + if(CollectionUtils.isEmpty(statusSet)){ + break; + } boolean allFinish = true; for (Integer integer : statusSet) { if (integer < 5) {