From 0587149cfdacbc022c7b845cd85dcff260a19d54 Mon Sep 17 00:00:00 2001 From: donqi Date: Fri, 18 Nov 2022 02:37:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 7 +++++-- .../ghy/web/controller/order/OrderDetailController.java | 6 ++++-- .../main/java/com/ghy/order/mapper/OrderDetailMapper.java | 2 +- .../main/java/com/ghy/order/mapper/OrderGoodsMapper.java | 2 +- .../src/main/resources/mapper/order/OrderMasterMapper.xml | 3 +++ 5 files changed, 14 insertions(+), 6 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 45aaa30e..dead6270 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 @@ -203,6 +203,7 @@ public class OrderController extends BaseController { for (FinancialDetail financialDetail : financialDetailService.selectByFinancialMasterId(fm.getId())) { if (FinancialDetailType.ORDER_FEE.getCode().equals(financialDetail.getFinancialDetailType())) { om.setAllSelfAssigned(0); + om.setOrderStatus(OrderStatus.GOING.code()); } realPay = realPay.subtract(financialDetail.getPayMoney()); } @@ -211,7 +212,6 @@ public class OrderController extends BaseController { // 判断是否全部派完 if(request.getIsAll() == 1){ - om.setOrderStatus(OrderStatus.GOING.code()); om.setHasDispatchedAll(1); } orderMasterService.updateOrderMaster(om); @@ -460,10 +460,13 @@ public class OrderController extends BaseController { response.setNewOrderNum(newMasterOrderCount + newDetailOrderCount); // 统计未排的单量 orderMaster.setOrderStatus(OrderStatus.PLAIN.code()); + // 如果查询的是未约未排状态，只查询未全部派完的主单 + orderMaster.setHasDispatchedAll(0); orderDetail.setOrderStatus(OrderStatus.PLAIN.code()); Long planMasterOrderCount = orderMasterService.countOrderMasterList(orderMaster); Long planDetailOrderCount = orderDetailService.countOrderDetailList(orderDetail); response.setPlanOrderNum(planMasterOrderCount + planDetailOrderCount); + orderMaster.setHasDispatchedAll(null); // 统计待上门单量 orderDetail.setOrderStatus(OrderStatus.GOING.code()); response.setWaitServOrderNum(orderDetailService.countOrderDetailList(orderDetail)); @@ -873,7 +876,7 @@ public class OrderController extends BaseController { public List getMasterList(OrderMaster orderMaster) { List orderListResponses = new ArrayList<>(); // 如果查询的是未约未排状态，只查询未全部派完的主单 - if (OrderStatus.PLAIN.equals(orderMaster.getOrderStatus())) { + if (orderMaster.getOrderStatus() != null && OrderStatus.PLAIN.code() == orderMaster.getOrderStatus()) { orderMaster.setHasDispatchedAll(0); } List list = orderMasterService.selectOrderMasterList(orderMaster); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 2f47ee91..68ecc3d2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -688,15 +688,17 @@ public class OrderDetailController extends BaseController { @ResponseBody @Transactional(rollbackFor = Exception.class) public AjaxResult rejectDetailOrder(@RequestBody OrderDetail orderDetail) { + // 查询子单信息 + OrderDetail detailInfo = this.orderDetailService.selectById(orderDetail.getId()); // 删除子单 orderDetailService.deleteOrderDetailByIds(orderDetail.getId().toString()); // 删除子财务单 financialDetailService.deleteFinancialDetailByOrderDetailId(orderDetail.getId()); // 删除派单记录 orderGoodsService.deleteByOrderDetailId(orderDetail.getId()); - // 查询子单信息 - OrderDetail detailInfo = this.orderDetailService.selectById(orderDetail.getId()); OrderMaster orderMaster2Update = new OrderMaster(); + orderMaster2Update.setId(detailInfo.getOrderMasterId()); + orderMaster2Update.setOrderStatus(OrderStatus.PLAIN.code()); // 查询是否还有派单记录，没有的话需要重置主单是否自己承接的字段为NULL List existOrderGoods = orderGoodsService.selectByOrderMasterId(detailInfo.getOrderMasterId()); if (CollectionUtils.isNotEmpty(existOrderGoods)) { diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java index 3c3cca92..c6445f2e 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java @@ -36,7 +36,7 @@ public interface OrderDetailMapper { * @param orderDetailId 细单表id * @return 细单表 */ - OrderDetail selectById(Long orderDetailId); + OrderDetail selectById(@Param("orderDetailId") Long orderDetailId); /** * @param orderMasterId 主订单id diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java index 591d465e..e1882ba3 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java @@ -33,7 +33,7 @@ public interface OrderGoodsMapper { */ OrderGoods selectById(Long orderGoodsId); - List selectByOrderId(Long orderId); + List selectByOrderId(@Param("orderId") Long orderId); List selectByOrderDetailId(@Param("orderDetailId") Long orderDetailId); diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 6c91d52d..d7a4db03 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -140,6 +140,9 @@ AND om.order_status in (${orderStatuses}) + + AND om.has_dispatched_all = #{hasDispatchedAll} + order by om.create_time