Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!766

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

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