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