diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 03520a0d..715df04d 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -12,6 +12,8 @@ import com.ghy.common.enums.OrderStatus; import com.ghy.common.enums.PayStatus; import com.ghy.common.exception.base.BaseException; import com.ghy.common.utils.AdapayUtils; +import com.ghy.common.utils.ObjectUtils; +import com.ghy.common.utils.StringUtils; import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderMaster; import com.ghy.order.mapper.OrderDetailMapper; @@ -92,6 +94,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { // 查子单信息 OrderDetail detailInfo = this.orderDetailMapper.selectById(orderDetail.getId()); // 判断是否需要更新主单状态.即是否有 + // 1.更新大于当前 detail 1/2/3 for (OrderDetail detail : orderDetailMapper.selectByOrderMasterId(detailInfo.getOrderMasterId())) { if (detail.getOrderStatus() < orderStatus) { flag = false; @@ -100,7 +103,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { } if (flag) { OrderMaster orderMaster = orderMasterMapper.selectById(detailInfo.getOrderMasterId()); - if (orderMaster.getOrderStatus() != OrderStatus.PLAIN.code()) { + if (ObjectUtils.isEmpty(orderDetail.getExpectTimeStart())) { orderMaster.setOrderStatus(orderStatus); orderMasterMapper.updateOrderMaster(orderMaster); }