优化

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

@@ -53,21 +53,23 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 		itemList = selectOrderDeliverItemVOList(orderId);
 
 		for (OrderDeliverItemVO itemVO : itemList) {
+			if (StringUtils.isBlank(itemVO.getDeliveryFlowId()) || itemVO.getDeliveryId() == null) {
+				itemVO.setDeliveryFlowId("");
+				itemVO.setDeliveryId(-1L);
+			}
+
 			for (UserDeliverOrderItemVO item : orderItems) {
 
 				if (item.getDeliveryTime() == null) {
 					continue;
 				}
 
-				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;
+				if (StringUtils.isBlank(item.getDeliveryFlowId()) || item.getDeliveryId() == null) {
+					item.setDeliveryFlowId("");
+					item.setDeliveryId(-1L);
 				}
 
+
 				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId()) && itemVO.getDeliveryId().equals(item.getDeliveryId())) {
 					UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
 					BeanUtils.copyProperties(item, flowItem);