cup 2 年之前
父節點
當前提交
0a0416fe06

+ 2 - 2
mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderItemServiceImpl.java

@@ -59,13 +59,13 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 					continue;
 				}
 
-				if (item.getDeliveryFlowId() == null || item.getDeliveryId() == null) {
+				if (StringUtils.isBlank(itemVO.getDeliveryFlowId()) || itemVO.getDeliveryId() == null) {
 					if (itemVO.getDeliveryTime().equals(item.getDeliveryTime())) {
 						UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
 						BeanUtils.copyProperties(item, flowItem);
 						itemVO.getItems().add(flowItem);
-						continue;
 					}
+					continue;
 				}
 
 				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId()) && itemVO.getDeliveryId().equals(item.getDeliveryId())) {