[shipment] changing type of orderId to long