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