物流包裹按发货时间区分

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

@@ -46,44 +46,19 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 		// 1.查询物流公司信息
 		itemList = selectOrderDeliverItemVOList(orderId);
 
-
-		List<UserDeliverOrderItem> userDeliverOrderItems = this.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-				.eq(UserDeliverOrderItem::getOrderId, orderId)
-				.isNull(UserDeliverOrderItem::getDeliveryFlowId)
-				.isNotNull(UserDeliverOrderItem::getDeliveryTime));
-
-		if (CollectionUtils.isNotEmpty(userDeliverOrderItems)) {
-			OrderDeliverItemVO orderDeliverItemVO = new OrderDeliverItemVO();
-			orderDeliverItemVO.setDeliveryTime(userDeliverOrderItems.get(0).getDeliveryTime());
-			itemList.add(orderDeliverItemVO);
-		}
-
-
-
 		for (OrderDeliverItemVO itemVO : itemList) {
-			String deliveryFlowId = itemVO.getDeliveryFlowId();
-			// 无需物流的设置一个默认的物流公司id
-			if (StringUtils.isBlank(deliveryFlowId)) {
-				deliveryFlowId = "no";
-			}
-
 			for (UserDeliverOrderItemVO item : orderItems) {
 
 				if (item.getDeliveryTime() == null) {
 					continue;
 				}
 
-
-				String itemDeliveryFlowId = item.getDeliveryFlowId();
-				if (StringUtils.isBlank(itemDeliveryFlowId)) {
-					itemDeliveryFlowId = "no";
-				}
-
-				if (deliveryFlowId.equals(itemDeliveryFlowId)){
+				if (itemVO.getDeliveryTime().equals(item.getDeliveryTime())) {
 					UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
 					BeanUtils.copyProperties(item, flowItem);
 					itemVO.getItems().add(flowItem);
 				}
+
 			}
 		}
 		return itemList;

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -31,7 +31,7 @@
 		select DISTINCT t1.delivery_id , t1.delivery_flow_id, t1.delivery_time, t2.company_name ,t2.company_home_url ,t2.query_url
 		from mp_user_deliver_order_item t1
 		left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
-		where t1.order_id = #{orderId} and t1.delivery_flow_id is not null
+		where t1.order_id = #{orderId} and t1.delivery_time is not null
 	</select>
 	
 	 <!-- 查询用户订单明细列表 -->