物流信息返回优化

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

@@ -41,10 +41,24 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 	@Override
 	public List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItemVO> orderItems) {
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
+
+
 		// 1.查询物流公司信息
 		itemList = selectOrderDeliverItemVOList(orderId);
 
-		HashMap<String, List<OrderDeliverItemVO>> deliverItemListMap = new HashMap<>(16);
+
+		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();

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_time is not null
+		where t1.order_id = #{orderId} and t1.delivery_flow_id is not null
 	</select>
 	
 	 <!-- 查询用户订单明细列表 -->