问题修复

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<OrderListResponse> getMasterList(OrderMaster orderMaster) {
         List<OrderListResponse> orderListResponses = new ArrayList<>();
         // 如果查询的是未约未排状态，只查询未全部派完的主单
-        if (OrderStatus.PLAIN.equals(orderMaster.getOrderStatus())) {
+        if (orderMaster.getOrderStatus() != null && OrderStatus.PLAIN.code() == orderMaster.getOrderStatus()) {
             orderMaster.setHasDispatchedAll(0);
         }
         List<OrderMaster> list = orderMasterService.selectOrderMasterList(orderMaster);

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<OrderGoods> existOrderGoods = orderGoodsService.selectByOrderMasterId(detailInfo.getOrderMasterId());
         if (CollectionUtils.isNotEmpty(existOrderGoods)) {

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

ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java

@@ -33,7 +33,7 @@ public interface OrderGoodsMapper {
      */
     OrderGoods selectById(Long orderGoodsId);
 
-    List<OrderGoods> selectByOrderId(Long orderId);
+    List<OrderGoods> selectByOrderId(@Param("orderId") Long orderId);
 
     List<OrderGoods> selectByOrderDetailId(@Param("orderDetailId") Long orderDetailId);
 

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -140,6 +140,9 @@
             <if test="orderStatuses != null and orderStatuses != ''">
                 AND om.order_status in (${orderStatuses})
             </if>
+            <if test="hasDispatchedAll != null">
+                AND om.has_dispatched_all = #{hasDispatchedAll}
+            </if>
         </where>
         order by om.create_time
         <trim suffixOverrides=",">