Merge branch 'bugfix0624' into 'master'

修复包裹展示问题

See merge request quanshu/mp-server!769

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

@@ -53,13 +53,24 @@ 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 (itemVO.getDeliveryTime().equals(item.getDeliveryTime())) {
+				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);
 					itemVO.getItems().add(flowItem);